merge

--HG--
branch : avatar-pipeline

28 files changed, 978 insertions, 982 deletions

diff --git a/indra/newview/app_settings/ignorable_dialogs.xml b/indra/newview/app_settings/ignorable_dialogs.xml
index ab18febccc..669235af1b 100644
--- a/indra/newview/app_settings/ignorable_dialogs.xml
+++ b/indra/newview/app_settings/ignorable_dialogs.xml
@@ -1,291 +1,291 @@
-<?xml version="1.0" ?>
-<llsd>
-<map>
-    <key>FirstAppearance</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstAppearance warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstAttach</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstAttach warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstBalanceDecrease</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstBalanceDecrease warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstBalanceIncrease</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstBalanceIncrease warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstBuild</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstBuild warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstDebugMenus</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstDebugMenus warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstFlexible</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstFlexible warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstGoTo</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstGoTo warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstInventory</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstInventory warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstLeftClickNoHit</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstLeftClickNoHit warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstMap</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstMap warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstMedia</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstMedia warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstOverrideKeys</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstOverrideKeys warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstSandbox</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstSandbox warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstSculptedPrim</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstSculptedPrim warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstSit</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstSit warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstStreamingMusic</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstStreamingMusic warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstStreamingVideo</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstStreamingVideo warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstTeleport</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstTeleport warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>FirstVoice</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstVoice warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>AboutDirectX9</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables AboutDirectX9 warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>BrowserLaunch</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables BrowserLaunch warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>DeedObject</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables DeedObject warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-  <key>NewClassified</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables NewClassified warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>QuickTimeInstalled</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables QuickTimeInstalled warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>ReturnToOwner</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables ReturnToOwner warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-  </map>
-</llsd>
+<?xml version="1.0" ?>

+<llsd>

+<map>

+    <key>FirstAppearance</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstAppearance warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstAttach</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstAttach warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstBalanceDecrease</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstBalanceDecrease warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstBalanceIncrease</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstBalanceIncrease warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstBuild</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstBuild warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstDebugMenus</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstDebugMenus warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstFlexible</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstFlexible warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstGoTo</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstGoTo warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstInventory</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstInventory warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstLeftClickNoHit</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstLeftClickNoHit warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstMap</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstMap warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstMedia</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstMedia warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstOverrideKeys</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstOverrideKeys warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstSandbox</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstSandbox warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstSculptedPrim</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstSculptedPrim warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstSit</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstSit warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstStreamingMusic</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstStreamingMusic warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstStreamingVideo</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstStreamingVideo warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstTeleport</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstTeleport warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>FirstVoice</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables FirstVoice warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>AboutDirectX9</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables AboutDirectX9 warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>BrowserLaunch</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables BrowserLaunch warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>DeedObject</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables DeedObject warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+  <key>NewClassified</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables NewClassified warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>QuickTimeInstalled</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables QuickTimeInstalled warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+    <key>ReturnToOwner</key>

+    <map>

+      <key>Comment</key>

+      <string>Enables ReturnToOwner warning dialog</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>1</integer>

+    </map>

+  </map>

+</llsd>

diff --git a/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt b/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt
index 30f9349111..185c0180fb 100644
--- a/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt
+++ b/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt
@@ -1,6 +1,6 @@
-The language files in this directory are Unicode (Little-Endian) format, also known as UTF-16 LE.
-
-This is the format required for NSIS Unicode.  See http://www.scratchpaper.com/ for details.
-
-James Cook
-September 2008
+The language files in this directory are Unicode (Little-Endian) format, also known as UTF-16 LE.

+

+This is the format required for NSIS Unicode.  See http://www.scratchpaper.com/ for details.

+

+James Cook

+September 2008

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index d7be09efa9..2a1fdb081e 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -162,16 +162,6 @@ std::string ICON_NAME[ICON_NAME_COUNT] =
 	"inv_item_linkfolder.tga"

 };

 

-

-// +=================================================+

-// |        LLInventoryPanelObserver                 |

-// +=================================================+

-void LLInventoryPanelObserver::changed(U32 mask)

-{

-	mIP->modelChanged(mask);

-}

-

-

 // +=================================================+

 // |        LLInvFVBridge                            |

 // +=================================================+

diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 4c7b0a0517..56cb0f93ed 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -107,22 +107,6 @@ struct LLAttachmentRezAction
 	S32		mAttachPt;
 };
 
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLInventoryPanelObserver
-//
-// Bridge to support knowing when the inventory has changed.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLInventoryPanelObserver : public LLInventoryObserver
-{
-public:
-	LLInventoryPanelObserver(LLInventoryPanel* ip) : mIP(ip) {}
-	virtual ~LLInventoryPanelObserver() {}
-	virtual void changed(U32 mask);
-protected:
-	LLInventoryPanel* mIP;
-};
-
 const std::string safe_inv_type_lookup(LLInventoryType::EType inv_type);
 void hide_context_entries(LLMenuGL& menu, 
 						const std::vector<std::string> &entries_to_show,
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 95cc68ddbe..efd40576a7 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -1,136 +1,136 @@
-/** 
- * @file llinventoryfunctions.h
- * @brief Miscellaneous inventory-related functions and classes
- * class definition
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLINVENTORYFUNCTIONS_H
-#define LL_LLINVENTORYFUNCTIONS_H
-
-#include "llassetstorage.h"
-#include "lldarray.h"
-#include "llfloater.h"
-#include "llinventory.h"
-#include "llinventoryfilter.h"
-#include "llfolderview.h"
-#include "llinventorymodel.h"
-#include "lluictrlfactory.h"
-#include <set>
-
-
-class LLFolderViewItem;
-class LLInventoryFilter;
-class LLInventoryModel;
-class LLInventoryPanel;
-class LLInvFVBridge;
-class LLInventoryFVBridgeBuilder;
-class LLMenuBarGL;
-class LLCheckBoxCtrl;
-class LLSpinCtrl;
-class LLScrollContainer;
-class LLTextBox;
-class LLIconCtrl;
-class LLSaveFolderState;
-class LLFilterEditor;
-class LLTabContainer;
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//
-// This is a collection of miscellaneous functions and classes
-// that don't fit cleanly into any other class header.
-//
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class LLInventoryState
-{
-public:
-	// HACK: Until we can route this info through the instant message hierarchy
-	static BOOL sWearNewClothing;
-	static LLUUID sWearNewClothingTransactionID;	// wear all clothing in this transaction	
-};
-
-class LLSelectFirstFilteredItem : public LLFolderViewFunctor
-{
-public:
-	LLSelectFirstFilteredItem() : mItemSelected(FALSE) {}
-	virtual ~LLSelectFirstFilteredItem() {}
-	virtual void doFolder(LLFolderViewFolder* folder);
-	virtual void doItem(LLFolderViewItem* item);
-	BOOL wasItemSelected() { return mItemSelected; }
-protected:
-	BOOL	mItemSelected;
-};
-
-class LLOpenFilteredFolders : public LLFolderViewFunctor
-{
-public:
-	LLOpenFilteredFolders()  {}
-	virtual ~LLOpenFilteredFolders() {}
-	virtual void doFolder(LLFolderViewFolder* folder);
-	virtual void doItem(LLFolderViewItem* item);
-};
-
-class LLSaveFolderState : public LLFolderViewFunctor
-{
-public:
-	LLSaveFolderState() : mApply(FALSE) {}
-	virtual ~LLSaveFolderState() {}
-	virtual void doFolder(LLFolderViewFolder* folder);
-	virtual void doItem(LLFolderViewItem* item) {}
-	void setApply(BOOL apply);
-	void clearOpenFolders() { mOpenFolders.clear(); }
-protected:
-	std::set<LLUUID> mOpenFolders;
-	BOOL mApply;
-};
-
-class LLOpenFoldersWithSelection : public LLFolderViewFunctor
-{
-public:
-	LLOpenFoldersWithSelection() {}
-	virtual ~LLOpenFoldersWithSelection() {}
-	virtual void doFolder(LLFolderViewFolder* folder);
-	virtual void doItem(LLFolderViewItem* item);
-};
-
-const std::string& get_item_icon_name(LLAssetType::EType asset_type,
-							 LLInventoryType::EType inventory_type,
-							 U32 attachment_point, 
-							 BOOL item_is_multi );
-
-LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,
-							 LLInventoryType::EType inventory_type,
-							 U32 attachment_point, 
-							 BOOL item_is_multi );
-
-#endif // LL_LLINVENTORYFUNCTIONS_H
-
-
-
+/** 

+ * @file llinventoryfunctions.h

+ * @brief Miscellaneous inventory-related functions and classes

+ * class definition

+ *

+ * $LicenseInfo:firstyear=2001&license=viewergpl$

+ * 

+ * Copyright (c) 2001-2009, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#ifndef LL_LLINVENTORYFUNCTIONS_H

+#define LL_LLINVENTORYFUNCTIONS_H

+

+#include "llassetstorage.h"

+#include "lldarray.h"

+#include "llfloater.h"

+#include "llinventory.h"

+#include "llinventoryfilter.h"

+#include "llfolderview.h"

+#include "llinventorymodel.h"

+#include "lluictrlfactory.h"

+#include <set>

+

+

+class LLFolderViewItem;

+class LLInventoryFilter;

+class LLInventoryModel;

+class LLInventoryPanel;

+class LLInvFVBridge;

+class LLInventoryFVBridgeBuilder;

+class LLMenuBarGL;

+class LLCheckBoxCtrl;

+class LLSpinCtrl;

+class LLScrollContainer;

+class LLTextBox;

+class LLIconCtrl;

+class LLSaveFolderState;

+class LLFilterEditor;

+class LLTabContainer;

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+//

+// This is a collection of miscellaneous functions and classes

+// that don't fit cleanly into any other class header.

+//

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+

+class LLInventoryState

+{

+public:

+	// HACK: Until we can route this info through the instant message hierarchy

+	static BOOL sWearNewClothing;

+	static LLUUID sWearNewClothingTransactionID;	// wear all clothing in this transaction	

+};

+

+class LLSelectFirstFilteredItem : public LLFolderViewFunctor

+{

+public:

+	LLSelectFirstFilteredItem() : mItemSelected(FALSE) {}

+	virtual ~LLSelectFirstFilteredItem() {}

+	virtual void doFolder(LLFolderViewFolder* folder);

+	virtual void doItem(LLFolderViewItem* item);

+	BOOL wasItemSelected() { return mItemSelected; }

+protected:

+	BOOL	mItemSelected;

+};

+

+class LLOpenFilteredFolders : public LLFolderViewFunctor

+{

+public:

+	LLOpenFilteredFolders()  {}

+	virtual ~LLOpenFilteredFolders() {}

+	virtual void doFolder(LLFolderViewFolder* folder);

+	virtual void doItem(LLFolderViewItem* item);

+};

+

+class LLSaveFolderState : public LLFolderViewFunctor

+{

+public:

+	LLSaveFolderState() : mApply(FALSE) {}

+	virtual ~LLSaveFolderState() {}

+	virtual void doFolder(LLFolderViewFolder* folder);

+	virtual void doItem(LLFolderViewItem* item) {}

+	void setApply(BOOL apply);

+	void clearOpenFolders() { mOpenFolders.clear(); }

+protected:

+	std::set<LLUUID> mOpenFolders;

+	BOOL mApply;

+};

+

+class LLOpenFoldersWithSelection : public LLFolderViewFunctor

+{

+public:

+	LLOpenFoldersWithSelection() {}

+	virtual ~LLOpenFoldersWithSelection() {}

+	virtual void doFolder(LLFolderViewFolder* folder);

+	virtual void doItem(LLFolderViewItem* item);

+};

+

+const std::string& get_item_icon_name(LLAssetType::EType asset_type,

+							 LLInventoryType::EType inventory_type,

+							 U32 attachment_point, 

+							 BOOL item_is_multi );

+

+LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,

+							 LLInventoryType::EType inventory_type,

+							 U32 attachment_point, 

+							 BOOL item_is_multi );

+

+#endif // LL_LLINVENTORYFUNCTIONS_H

+

+

+

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 6b1f7313dd..dc704f2b82 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -36,8 +36,6 @@
 

 #include "llinventorypanel.h"

 

-// Seraph TODO: Remove unnecessary headers

-

 #include "llagent.h"

 #include "llagentwearables.h"

 #include "llappearancemgr.h"

@@ -56,6 +54,22 @@ const std::string LLInventoryPanel::RECENTITEMS_SORT_ORDER = std::string("Recent
 const std::string LLInventoryPanel::INHERIT_SORT_ORDER = std::string("");

 static const LLInventoryFVBridgeBuilder INVENTORY_BRIDGE_BUILDER;

 

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+// Class LLInventoryPanelObserver

+//

+// Bridge to support knowing when the inventory has changed.

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+class LLInventoryPanelObserver : public LLInventoryObserver

+{

+public:

+	LLInventoryPanelObserver(LLInventoryPanel* ip) : mIP(ip) {}

+	virtual ~LLInventoryPanelObserver() {}

+	virtual void changed(U32 mask);

+protected:

+	LLInventoryPanel* mIP;

+};

+

 LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :	

 	LLPanel(p),

 	mInventoryObserver(NULL),

@@ -872,3 +886,11 @@ void example_param_block_usage()
 

 	LLUICtrlFactory::create<LLInventoryPanel>(param_block);

 }

+

+// +=================================================+

+// |        LLInventoryPanelObserver                 |

+// +=================================================+

+void LLInventoryPanelObserver::changed(U32 mask)

+{

+	mIP->modelChanged(mask);

+}

diff --git a/indra/newview/llpanelobjectinventory.h b/indra/newview/llpanelobjectinventory.h
index 6722bb212e..7a39d8fabc 100644
--- a/indra/newview/llpanelobjectinventory.h
+++ b/indra/newview/llpanelobjectinventory.h
@@ -1,102 +1,102 @@
-/** 
- * @file llpanelobjectinventory.h
- * @brief LLPanelObjectInventory class definition
- *
- * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
- * Copyright (c) 2002-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLPANELOBJECTINVENTORY_H
-#define LL_LLPANELOBJECTINVENTORY_H
-
-#include "llvoinventorylistener.h"
-#include "llpanel.h"
-
-#include "llinventory.h"
-
-class LLScrollContainer;
-class LLFolderView;
-class LLFolderViewFolder;
-class LLViewerObject;
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLPanelObjectInventory
-//
-// This class represents the panel used to view and control a
-// particular task's inventory.
-//
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLPanelObjectInventory : public LLPanel, public LLVOInventoryListener
-{
-public:
-	// dummy param block for template registration purposes
-	struct Params : public LLPanel::Params {};
-
-	LLPanelObjectInventory(const Params&);
-	virtual ~LLPanelObjectInventory();
-	
-	virtual BOOL postBuild();
-
-	void doToSelected(const LLSD& userdata);
-	
-	void refresh();
-	const LLUUID& getTaskUUID() { return mTaskUUID;}
-	void removeSelectedItem();
-	void startRenamingSelectedItem();
-
-	LLFolderView* getRootFolder() const { return mFolders; }
-
-	virtual void draw();
-	virtual void deleteAllChildren();
-	virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg);
-	
-	static void idle(void* user_data);
-
-protected:
-	void reset();
-	/*virtual*/ void inventoryChanged(LLViewerObject* object,
-								 InventoryObjectList* inventory,
-								 S32 serial_num,
-								 void* user_data);
-	void updateInventory();
-	void createFolderViews(LLInventoryObject* inventory_root, InventoryObjectList& contents);
-	void createViewsForCategory(InventoryObjectList* inventory,
-								LLInventoryObject* parent,
-								LLFolderViewFolder* folder);
-	void clearContents();
-
-private:
-	LLScrollContainer* mScroller;
-	LLFolderView* mFolders;
-	
-	LLUUID mTaskUUID;
-	BOOL mHaveInventory;
-	BOOL mIsInventoryEmpty;
-	BOOL mInventoryNeedsUpdate;
-};
-
-#endif // LL_LLPANELOBJECTINVENTORY_H
+/** 

+ * @file llpanelobjectinventory.h

+ * @brief LLPanelObjectInventory class definition

+ *

+ * $LicenseInfo:firstyear=2002&license=viewergpl$

+ * 

+ * Copyright (c) 2002-2009, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#ifndef LL_LLPANELOBJECTINVENTORY_H

+#define LL_LLPANELOBJECTINVENTORY_H

+

+#include "llvoinventorylistener.h"

+#include "llpanel.h"

+

+#include "llinventory.h"

+

+class LLScrollContainer;

+class LLFolderView;

+class LLFolderViewFolder;

+class LLViewerObject;

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+// Class LLPanelObjectInventory

+//

+// This class represents the panel used to view and control a

+// particular task's inventory.

+//

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+class LLPanelObjectInventory : public LLPanel, public LLVOInventoryListener

+{

+public:

+	// dummy param block for template registration purposes

+	struct Params : public LLPanel::Params {};

+

+	LLPanelObjectInventory(const Params&);

+	virtual ~LLPanelObjectInventory();

+	

+	virtual BOOL postBuild();

+

+	void doToSelected(const LLSD& userdata);

+	

+	void refresh();

+	const LLUUID& getTaskUUID() { return mTaskUUID;}

+	void removeSelectedItem();

+	void startRenamingSelectedItem();

+

+	LLFolderView* getRootFolder() const { return mFolders; }

+

+	virtual void draw();

+	virtual void deleteAllChildren();

+	virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg);

+	

+	static void idle(void* user_data);

+

+protected:

+	void reset();

+	/*virtual*/ void inventoryChanged(LLViewerObject* object,

+								 InventoryObjectList* inventory,

+								 S32 serial_num,

+								 void* user_data);

+	void updateInventory();

+	void createFolderViews(LLInventoryObject* inventory_root, InventoryObjectList& contents);

+	void createViewsForCategory(InventoryObjectList* inventory,

+								LLInventoryObject* parent,

+								LLFolderViewFolder* folder);

+	void clearContents();

+

+private:

+	LLScrollContainer* mScroller;

+	LLFolderView* mFolders;

+	

+	LLUUID mTaskUUID;

+	BOOL mHaveInventory;

+	BOOL mIsInventoryEmpty;

+	BOOL mInventoryNeedsUpdate;

+};

+

+#endif // LL_LLPANELOBJECTINVENTORY_H

diff --git a/indra/newview/skins/default/html/da/loading/loading.html b/indra/newview/skins/default/html/da/loading/loading.html
index 5f3426eb60..cdad5702b9 100644
--- a/indra/newview/skins/default/html/da/loading/loading.html
+++ b/indra/newview/skins/default/html/da/loading/loading.html
@@ -1,10 +1,10 @@
-<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;Indlæser...
-		</td>
-	</tr>
-</table>
-</body>
+<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;Indlæser...

+		</td>

+	</tr>

+</table>

+</body>

diff --git a/indra/newview/skins/default/html/de/loading/loading.html b/indra/newview/skins/default/html/de/loading/loading.html
index 44a621b216..3eddbc24f5 100644
--- a/indra/newview/skins/default/html/de/loading/loading.html
+++ b/indra/newview/skins/default/html/de/loading/loading.html
@@ -1,10 +1,10 @@
-<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;Wird geladen...
-		</td>
-	</tr>
-</table>
-</body>
+<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;Wird geladen...

+		</td>

+	</tr>

+</table>

+</body>

diff --git a/indra/newview/skins/default/html/en-us/loading/loading.html b/indra/newview/skins/default/html/en-us/loading/loading.html
index 1c62d2f73e..34e5c84c4d 100644
--- a/indra/newview/skins/default/html/en-us/loading/loading.html
+++ b/indra/newview/skins/default/html/en-us/loading/loading.html
@@ -1,9 +1,9 @@
-<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="sl_logo_rotate_black.gif" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;loading...
-		</td>
-	</tr>
-</table>
-</body>
+<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="sl_logo_rotate_black.gif" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;loading...

+		</td>

+	</tr>

+</table>

+</body>

diff --git a/indra/newview/skins/default/html/es/loading/loading.html b/indra/newview/skins/default/html/es/loading/loading.html
index c4260b34c0..f03284ba8c 100644
--- a/indra/newview/skins/default/html/es/loading/loading.html
+++ b/indra/newview/skins/default/html/es/loading/loading.html
@@ -1,10 +1,10 @@
-<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;Cargando...
-		</td>
-	</tr>
-</table>
-</body>
+<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;Cargando...

+		</td>

+	</tr>

+</table>

+</body>

diff --git a/indra/newview/skins/default/html/fr/loading/loading.html b/indra/newview/skins/default/html/fr/loading/loading.html
index b3953448e9..23c0ef03bc 100644
--- a/indra/newview/skins/default/html/fr/loading/loading.html
+++ b/indra/newview/skins/default/html/fr/loading/loading.html
@@ -1,10 +1,10 @@
-<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;Chargement...
-		</td>
-	</tr>
-</table>
-</body>
+<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;Chargement...

+		</td>

+	</tr>

+</table>

+</body>

diff --git a/indra/newview/skins/default/html/hu/loading/loading.html b/indra/newview/skins/default/html/hu/loading/loading.html
index ab15a073ba..ade91f76c2 100644
--- a/indra/newview/skins/default/html/hu/loading/loading.html
+++ b/indra/newview/skins/default/html/hu/loading/loading.html
@@ -1,10 +1,10 @@
-<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;Betöltés folyamatban...
-		</td>
-	</tr>
-</table>
-</body>
+<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;Betöltés folyamatban...

+		</td>

+	</tr>

+</table>

+</body>

diff --git a/indra/newview/skins/default/html/it/loading/loading.html b/indra/newview/skins/default/html/it/loading/loading.html
index ab37e41f04..0f9af31f6e 100644
--- a/indra/newview/skins/default/html/it/loading/loading.html
+++ b/indra/newview/skins/default/html/it/loading/loading.html
@@ -1,10 +1,10 @@
-<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;Attendi...
-		</td>
-	</tr>
-</table>
-</body>
+<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;Attendi...

+		</td>

+	</tr>

+</table>

+</body>

diff --git a/indra/newview/skins/default/html/ja/loading/loading.html b/indra/newview/skins/default/html/ja/loading/loading.html
index 35cf74a35f..069dc5d12f 100644
--- a/indra/newview/skins/default/html/ja/loading/loading.html
+++ b/indra/newview/skins/default/html/ja/loading/loading.html
@@ -1,10 +1,10 @@
-<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>
+<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>

diff --git a/indra/newview/skins/default/html/nl/loading/loading.html b/indra/newview/skins/default/html/nl/loading/loading.html
index 0215bd7e47..39a8691f3f 100644
--- a/indra/newview/skins/default/html/nl/loading/loading.html
+++ b/indra/newview/skins/default/html/nl/loading/loading.html
@@ -1,10 +1,10 @@
-<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;Laden...
-		</td>
-	</tr>
-</table>
-</body>
+<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;Laden...

+		</td>

+	</tr>

+</table>

+</body>

diff --git a/indra/newview/skins/default/html/pl/loading/loading.html b/indra/newview/skins/default/html/pl/loading/loading.html
index 50f3dfb0c5..515890c2d5 100644
--- a/indra/newview/skins/default/html/pl/loading/loading.html
+++ b/indra/newview/skins/default/html/pl/loading/loading.html
@@ -1,10 +1,10 @@
-<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;Ładowanie...
-		</td>
-	</tr>
-</table>
-</body>
+<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;Ładowanie...

+		</td>

+	</tr>

+</table>

+</body>

diff --git a/indra/newview/skins/default/html/pt/loading/loading.html b/indra/newview/skins/default/html/pt/loading/loading.html
index a83e1123d0..635ea62406 100644
--- a/indra/newview/skins/default/html/pt/loading/loading.html
+++ b/indra/newview/skins/default/html/pt/loading/loading.html
@@ -1,10 +1,10 @@
-<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;Carregando...
-		</td>
-	</tr>
-</table>
-</body>
+<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;Carregando...

+		</td>

+	</tr>

+</table>

+</body>

diff --git a/indra/newview/skins/default/html/ru/loading/loading.html b/indra/newview/skins/default/html/ru/loading/loading.html
index 892c0b9f7f..dcc0d73c1a 100644
--- a/indra/newview/skins/default/html/ru/loading/loading.html
+++ b/indra/newview/skins/default/html/ru/loading/loading.html
@@ -1,10 +1,10 @@
-<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>
+<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>

diff --git a/indra/newview/skins/default/html/tr/loading/loading.html b/indra/newview/skins/default/html/tr/loading/loading.html
index 1ac07bff34..e7812e7c8e 100644
--- a/indra/newview/skins/default/html/tr/loading/loading.html
+++ b/indra/newview/skins/default/html/tr/loading/loading.html
@@ -1,10 +1,10 @@
-<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;Yükleniyor...
-		</td>
-	</tr>
-</table>
-</body>
+<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;Yükleniyor...

+		</td>

+	</tr>

+</table>

+</body>

diff --git a/indra/newview/skins/default/html/uk/loading/loading.html b/indra/newview/skins/default/html/uk/loading/loading.html
index 3b5b8679b4..0f67994635 100644
--- a/indra/newview/skins/default/html/uk/loading/loading.html
+++ b/indra/newview/skins/default/html/uk/loading/loading.html
@@ -1,10 +1,10 @@
-<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>
+<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>

diff --git a/indra/newview/skins/default/html/zh/loading/loading.html b/indra/newview/skins/default/html/zh/loading/loading.html
index d1d5d25c92..462ea291d9 100644
--- a/indra/newview/skins/default/html/zh/loading/loading.html
+++ b/indra/newview/skins/default/html/zh/loading/loading.html
@@ -1,10 +1,10 @@
-<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>
+<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>

diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
index b4d0fa20ef..74b7c7dd72 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="edit_profile_panel">
-   <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
-   </string>
-   <string name="AcctTypeResident"
-    value="Beboer" />
-   <string name="AcctTypeTrial"
-    value="På prøve" />
-   <string name="AcctTypeCharterMember"
-    value="æresmedlem" />
-   <string name="AcctTypeEmployee"
-    value="Linden Lab medarbejder" />
-   <string name="PaymentInfoUsed"
-    value="Betalende medlem" />
-   <string name="PaymentInfoOnFile"
-    value="Registreret betalende" />
-   <string name="NoPaymentInfoOnFile"
-    value="Ingen betalingsinfo" />
-   <string name="AgeVerified"
-    value="Alders-checket" />
-   <string name="NotAgeVerified"
-    value="Ikke alders-checket" />
-   <string name="partner_edit_link_url">
-       http://www.secondlife.com/account/partners.php?lang=da
-   </string>
-    <panel name="scroll_content_panel">
-    <panel name="data_panel" >
-     <panel name="lifes_images_panel">
-          <panel name="second_life_image_panel">
-              <text name="second_life_photo_title_text">
-			[SECOND_LIFE]:
-              </text>
-          </panel>
-      </panel>
-        <text name="title_partner_text" value="Partner:"/>
-        <panel name="partner_data_panel">
-            <text name="partner_text" value="[FIRST] [LAST]"/>
-         </panel>
-      <text name="text_box3">
-	Optaget autosvar:
-      </text>
-    </panel>
-    </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="edit_profile_panel">

+   <string name="CaptionTextAcctInfo">

+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]

+   </string>

+   <string name="AcctTypeResident"

+    value="Beboer" />

+   <string name="AcctTypeTrial"

+    value="På prøve" />

+   <string name="AcctTypeCharterMember"

+    value="æresmedlem" />

+   <string name="AcctTypeEmployee"

+    value="Linden Lab medarbejder" />

+   <string name="PaymentInfoUsed"

+    value="Betalende medlem" />

+   <string name="PaymentInfoOnFile"

+    value="Registreret betalende" />

+   <string name="NoPaymentInfoOnFile"

+    value="Ingen betalingsinfo" />

+   <string name="AgeVerified"

+    value="Alders-checket" />

+   <string name="NotAgeVerified"

+    value="Ikke alders-checket" />

+   <string name="partner_edit_link_url">

+       http://www.secondlife.com/account/partners.php?lang=da

+   </string>

+    <panel name="scroll_content_panel">

+    <panel name="data_panel" >

+     <panel name="lifes_images_panel">

+          <panel name="second_life_image_panel">

+              <text name="second_life_photo_title_text">

+			[SECOND_LIFE]:

+              </text>

+          </panel>

+      </panel>

+        <text name="title_partner_text" value="Partner:"/>

+        <panel name="partner_data_panel">

+            <text name="partner_text" value="[FIRST] [LAST]"/>

+         </panel>

+      <text name="text_box3">

+	Optaget autosvar:

+      </text>

+    </panel>

+    </panel>

+</panel>

diff --git a/indra/newview/skins/default/xui/es/panel_edit_profile.xml b/indra/newview/skins/default/xui/es/panel_edit_profile.xml
index c12dd8d58c..bcf4128e01 100644
--- a/indra/newview/skins/default/xui/es/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_profile.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="edit_profile_panel">
-   <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
-   </string>
-   <string name="AcctTypeResident"
-    value="Residente" />
-   <string name="AcctTypeTrial"
-    value="Prueba" />
-   <string name="AcctTypeCharterMember"
-    value="Miembro fundador" />
-   <string name="AcctTypeEmployee"
-    value="Empleado de Linden Lab" />
-   <string name="PaymentInfoUsed"
-    value="Ha usado una forma de pago" />
-   <string name="PaymentInfoOnFile"
-    value="Hay infor. de la forma de pago" />
-   <string name="NoPaymentInfoOnFile"
-    value="Sin infor. de la forma de pago" />
-   <string name="AgeVerified"
-    value="Edad verificada" />
-   <string name="NotAgeVerified"
-    value="Edad no verificada" />
-   <string name="partner_edit_link_url">
-       http://www.secondlife.com/account/partners.php?lang=es
-   </string>
-    <panel name="scroll_content_panel">
-    <panel name="data_panel" >
-     <panel name="lifes_images_panel">
-          <panel name="second_life_image_panel">
-              <text name="second_life_photo_title_text">
-			[SECOND_LIFE]:
-              </text>
-          </panel>
-      </panel>
-        <text name="title_partner_text" value="Compañero/a:"/>
-        <panel name="partner_data_panel">
-            <text name="partner_text" value="[FIRST] [LAST]"/>
-         </panel>
-      <text name="text_box3">
-	Mensaje en el estado ocupado:
-      </text>
-    </panel>
-    </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="edit_profile_panel">

+   <string name="CaptionTextAcctInfo">

+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]

+   </string>

+   <string name="AcctTypeResident"

+    value="Residente" />

+   <string name="AcctTypeTrial"

+    value="Prueba" />

+   <string name="AcctTypeCharterMember"

+    value="Miembro fundador" />

+   <string name="AcctTypeEmployee"

+    value="Empleado de Linden Lab" />

+   <string name="PaymentInfoUsed"

+    value="Ha usado una forma de pago" />

+   <string name="PaymentInfoOnFile"

+    value="Hay infor. de la forma de pago" />

+   <string name="NoPaymentInfoOnFile"

+    value="Sin infor. de la forma de pago" />

+   <string name="AgeVerified"

+    value="Edad verificada" />

+   <string name="NotAgeVerified"

+    value="Edad no verificada" />

+   <string name="partner_edit_link_url">

+       http://www.secondlife.com/account/partners.php?lang=es

+   </string>

+    <panel name="scroll_content_panel">

+    <panel name="data_panel" >

+     <panel name="lifes_images_panel">

+          <panel name="second_life_image_panel">

+              <text name="second_life_photo_title_text">

+			[SECOND_LIFE]:

+              </text>

+          </panel>

+      </panel>

+        <text name="title_partner_text" value="Compañero/a:"/>

+        <panel name="partner_data_panel">

+            <text name="partner_text" value="[FIRST] [LAST]"/>

+         </panel>

+      <text name="text_box3">

+	Mensaje en el estado ocupado:

+      </text>

+    </panel>

+    </panel>

+</panel>

diff --git a/indra/newview/skins/default/xui/it/panel_edit_profile.xml b/indra/newview/skins/default/xui/it/panel_edit_profile.xml
index 33f3c367c2..0eba7bf3b6 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_profile.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="edit_profile_panel">
-   <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
-   </string>
-   <string name="AcctTypeResident"
-    value="Residente" />
-   <string name="AcctTypeTrial"
-    value="Prova" />
-   <string name="AcctTypeCharterMember"
-    value="Membro privilegiato" />
-   <string name="AcctTypeEmployee"
-    value="Impiegato della Linden Lab" />
-   <string name="PaymentInfoUsed"
-    value="Info. di pagamento usate" />
-   <string name="PaymentInfoOnFile"
-    value="Info. di pagamento in archivio" />
-   <string name="NoPaymentInfoOnFile"
-    value="Nessuna info. di pagamento" />
-   <string name="AgeVerified"
-    value="Età verificata" />
-   <string name="NotAgeVerified"
-    value="Età non verificata" />
-   <string name="partner_edit_link_url">
-       http://www.secondlife.com/account/partners.php?lang=it
-   </string>
-    <panel name="scroll_content_panel">
-    <panel name="data_panel" >
-     <panel name="lifes_images_panel">
-          <panel name="second_life_image_panel">
-              <text name="second_life_photo_title_text">
-			[SECOND_LIFE]:
-              </text>
-          </panel>
-      </panel>
-        <text name="title_partner_text" value="Partner:"/>
-        <panel name="partner_data_panel">
-            <text name="partner_text" value="[FIRST] [LAST]"/>
-         </panel>
-      <text name="text_box3">
-	Risposta agli IM quando sono in &apos;Occupato&apos;:
-      </text>
-    </panel>
-    </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="edit_profile_panel">

+   <string name="CaptionTextAcctInfo">

+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]

+   </string>

+   <string name="AcctTypeResident"

+    value="Residente" />

+   <string name="AcctTypeTrial"

+    value="Prova" />

+   <string name="AcctTypeCharterMember"

+    value="Membro privilegiato" />

+   <string name="AcctTypeEmployee"

+    value="Impiegato della Linden Lab" />

+   <string name="PaymentInfoUsed"

+    value="Info. di pagamento usate" />

+   <string name="PaymentInfoOnFile"

+    value="Info. di pagamento in archivio" />

+   <string name="NoPaymentInfoOnFile"

+    value="Nessuna info. di pagamento" />

+   <string name="AgeVerified"

+    value="Età verificata" />

+   <string name="NotAgeVerified"

+    value="Età non verificata" />

+   <string name="partner_edit_link_url">

+       http://www.secondlife.com/account/partners.php?lang=it

+   </string>

+    <panel name="scroll_content_panel">

+    <panel name="data_panel" >

+     <panel name="lifes_images_panel">

+          <panel name="second_life_image_panel">

+              <text name="second_life_photo_title_text">

+			[SECOND_LIFE]:

+              </text>

+          </panel>

+      </panel>

+        <text name="title_partner_text" value="Partner:"/>

+        <panel name="partner_data_panel">

+            <text name="partner_text" value="[FIRST] [LAST]"/>

+         </panel>

+      <text name="text_box3">

+	Risposta agli IM quando sono in &apos;Occupato&apos;:

+      </text>

+    </panel>

+    </panel>

+</panel>

diff --git a/indra/newview/skins/default/xui/nl/panel_edit_profile.xml b/indra/newview/skins/default/xui/nl/panel_edit_profile.xml
index 172395e20a..00f8c087de 100644
--- a/indra/newview/skins/default/xui/nl/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/nl/panel_edit_profile.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="edit_profile_panel">
-   <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
-   </string>
-   <string name="AcctTypeResident"
-    value="Inwoner" />
-   <string name="AcctTypeTrial"
-    value="Proef" />
-   <string name="AcctTypeCharterMember"
-    value="Charter lid" />
-   <string name="AcctTypeEmployee"
-    value="Linden Lab werknemer" />
-   <string name="PaymentInfoUsed"
-    value="Betalingsinformatie gebruikt" />
-   <string name="PaymentInfoOnFile"
-    value="Betalingsinformatie aanwezig" />
-   <string name="NoPaymentInfoOnFile"
-    value="Geen betalingsinfo aanwezig" />
-   <string name="AgeVerified"
-    value="Leeftijd geverifieerd" />
-   <string name="NotAgeVerified"
-    value="Leeftijd niet geverifieerd" />
-   <string name="partner_edit_link_url">
-       http://www.secondlife.com/account/partners.php?lang=nl
-   </string>
-    <panel name="scroll_content_panel">
-    <panel name="data_panel" >
-     <panel name="lifes_images_panel">
-          <panel name="second_life_image_panel">
-              <text name="second_life_photo_title_text">
-			[SECOND_LIFE]:
-              </text>
-          </panel>
-      </panel>
-        <text name="title_partner_text" value="Partner:"/>
-        <panel name="partner_data_panel">
-            <text name="partner_text" value="[FIRST] [LAST]"/>
-         </panel>
-      <text name="text_box3">
-	Antwoord bij Niet Storen:
-      </text>
-    </panel>
-    </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="edit_profile_panel">

+   <string name="CaptionTextAcctInfo">

+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]

+   </string>

+   <string name="AcctTypeResident"

+    value="Inwoner" />

+   <string name="AcctTypeTrial"

+    value="Proef" />

+   <string name="AcctTypeCharterMember"

+    value="Charter lid" />

+   <string name="AcctTypeEmployee"

+    value="Linden Lab werknemer" />

+   <string name="PaymentInfoUsed"

+    value="Betalingsinformatie gebruikt" />

+   <string name="PaymentInfoOnFile"

+    value="Betalingsinformatie aanwezig" />

+   <string name="NoPaymentInfoOnFile"

+    value="Geen betalingsinfo aanwezig" />

+   <string name="AgeVerified"

+    value="Leeftijd geverifieerd" />

+   <string name="NotAgeVerified"

+    value="Leeftijd niet geverifieerd" />

+   <string name="partner_edit_link_url">

+       http://www.secondlife.com/account/partners.php?lang=nl

+   </string>

+    <panel name="scroll_content_panel">

+    <panel name="data_panel" >

+     <panel name="lifes_images_panel">

+          <panel name="second_life_image_panel">

+              <text name="second_life_photo_title_text">

+			[SECOND_LIFE]:

+              </text>

+          </panel>

+      </panel>

+        <text name="title_partner_text" value="Partner:"/>

+        <panel name="partner_data_panel">

+            <text name="partner_text" value="[FIRST] [LAST]"/>

+         </panel>

+      <text name="text_box3">

+	Antwoord bij Niet Storen:

+      </text>

+    </panel>

+    </panel>

+</panel>

diff --git a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
index 97fa3118f8..e449a92d7e 100644
--- a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="edit_profile_panel">
-   <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
-   </string>
-   <string name="AcctTypeResident"
-    value="Rezydent" />
-   <string name="AcctTypeTrial"
-    value="Próbne" />
-   <string name="AcctTypeCharterMember"
-    value="Członek-zalożyciel" />
-   <string name="AcctTypeEmployee"
-    value="Pracownik Linden Lab" />
-   <string name="PaymentInfoUsed"
-    value="Dane Konta Używane" />
-   <string name="PaymentInfoOnFile"
-    value="Dane Konta Dostępne" />
-   <string name="NoPaymentInfoOnFile"
-    value="Brak Danych Konta" />
-   <string name="AgeVerified"
-    value="Wiek Zweryfikowany" />
-   <string name="NotAgeVerified"
-    value="Brak Weryfikacji Wieku" />
-   <string name="partner_edit_link_url">
-       http://www.secondlife.com/account/partners.php?lang=pl
-   </string>
-    <panel name="scroll_content_panel">
-    <panel name="data_panel" >
-     <panel name="lifes_images_panel">
-          <panel name="second_life_image_panel">
-              <text name="second_life_photo_title_text">
-			[SECOND_LIFE]:
-              </text>
-          </panel>
-      </panel>
-        <text name="title_partner_text" value="Partner:"/>
-        <panel name="partner_data_panel">
-            <text name="partner_text" value="[FIRST] [LAST]"/>
-         </panel>
-      <text name="text_box3">
-	Pracuś Mówi:
-      </text>
-    </panel>
-    </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="edit_profile_panel">

+   <string name="CaptionTextAcctInfo">

+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]

+   </string>

+   <string name="AcctTypeResident"

+    value="Rezydent" />

+   <string name="AcctTypeTrial"

+    value="Próbne" />

+   <string name="AcctTypeCharterMember"

+    value="Członek-zalożyciel" />

+   <string name="AcctTypeEmployee"

+    value="Pracownik Linden Lab" />

+   <string name="PaymentInfoUsed"

+    value="Dane Konta Używane" />

+   <string name="PaymentInfoOnFile"

+    value="Dane Konta Dostępne" />

+   <string name="NoPaymentInfoOnFile"

+    value="Brak Danych Konta" />

+   <string name="AgeVerified"

+    value="Wiek Zweryfikowany" />

+   <string name="NotAgeVerified"

+    value="Brak Weryfikacji Wieku" />

+   <string name="partner_edit_link_url">

+       http://www.secondlife.com/account/partners.php?lang=pl

+   </string>

+    <panel name="scroll_content_panel">

+    <panel name="data_panel" >

+     <panel name="lifes_images_panel">

+          <panel name="second_life_image_panel">

+              <text name="second_life_photo_title_text">

+			[SECOND_LIFE]:

+              </text>

+          </panel>

+      </panel>

+        <text name="title_partner_text" value="Partner:"/>

+        <panel name="partner_data_panel">

+            <text name="partner_text" value="[FIRST] [LAST]"/>

+         </panel>

+      <text name="text_box3">

+	Pracuś Mówi:

+      </text>

+    </panel>

+    </panel>

+</panel>

diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
index a989cab167..e97e77cfe6 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="edit_profile_panel">
-   <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
-   </string>
-   <string name="AcctTypeResident"
-    value="Residente" />
-   <string name="AcctTypeTrial"
-    value="Teste" />
-   <string name="AcctTypeCharterMember"
-    value="Estatuto do membro" />
-   <string name="AcctTypeEmployee"
-    value="Contratado da Linden Lab" />
-   <string name="PaymentInfoUsed"
-    value="Infor. de pagamento utilizadas" />
-   <string name="PaymentInfoOnFile"
-    value="Infor. de pagamento no arquivo" />
-   <string name="NoPaymentInfoOnFile"
-    value="Sem infor. de pagamento no arquivo" />
-   <string name="AgeVerified"
-    value="Idade Verificada" />
-   <string name="NotAgeVerified"
-    value="Idade não Verificada" />
-   <string name="partner_edit_link_url">
-       http://www.secondlife.com/account/partners.php?lang=pt
-   </string>
-    <panel name="scroll_content_panel">
-    <panel name="data_panel" >
-     <panel name="lifes_images_panel">
-          <panel name="second_life_image_panel">
-              <text name="second_life_photo_title_text">
-			[SECOND_LIFE]:
-              </text>
-          </panel>
-      </panel>
-        <text name="title_partner_text" value="Parceiro:"/>
-        <panel name="partner_data_panel">
-            <text name="partner_text" value="[FIRST] [LAST]"/>
-         </panel>
-      <text name="text_box3">
-	Resposta no Modo Ocupado:
-      </text>
-    </panel>
-    </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="edit_profile_panel">

+   <string name="CaptionTextAcctInfo">

+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]

+   </string>

+   <string name="AcctTypeResident"

+    value="Residente" />

+   <string name="AcctTypeTrial"

+    value="Teste" />

+   <string name="AcctTypeCharterMember"

+    value="Estatuto do membro" />

+   <string name="AcctTypeEmployee"

+    value="Contratado da Linden Lab" />

+   <string name="PaymentInfoUsed"

+    value="Infor. de pagamento utilizadas" />

+   <string name="PaymentInfoOnFile"

+    value="Infor. de pagamento no arquivo" />

+   <string name="NoPaymentInfoOnFile"

+    value="Sem infor. de pagamento no arquivo" />

+   <string name="AgeVerified"

+    value="Idade Verificada" />

+   <string name="NotAgeVerified"

+    value="Idade não Verificada" />

+   <string name="partner_edit_link_url">

+       http://www.secondlife.com/account/partners.php?lang=pt

+   </string>

+    <panel name="scroll_content_panel">

+    <panel name="data_panel" >

+     <panel name="lifes_images_panel">

+          <panel name="second_life_image_panel">

+              <text name="second_life_photo_title_text">

+			[SECOND_LIFE]:

+              </text>

+          </panel>

+      </panel>

+        <text name="title_partner_text" value="Parceiro:"/>

+        <panel name="partner_data_panel">

+            <text name="partner_text" value="[FIRST] [LAST]"/>

+         </panel>

+      <text name="text_box3">

+	Resposta no Modo Ocupado:

+      </text>

+    </panel>

+    </panel>

+</panel>