Merge branch 'Canon' of git://github.com/Lirusaito/SingularityViewer

indra/llinventory/llparcelflags.h

@@ -59,6 +59,7 @@ const U32 PF_URL_WEB_PAGE				= 1 << 19;	// The "media URL" is an HTML page
 const U32 PF_URL_RAW_HTML				= 1 << 20;	// The "media URL" is a raw HTML string like <H1>Foo</H1>
 const U32 PF_RESTRICT_PUSHOBJECT		= 1 << 21;	// Restrict push object to either on agent or on scripts owned by parcel owner
 const U32 PF_DENY_ANONYMOUS				= 1 << 22;	// Deny all non identified/transacted accounts
+const U32 PF_GAMING						= 1 << 23;	// Denotes a gaming parcel on certain grids
 // const U32 PF_DENY_IDENTIFIED			= 1 << 23;	// Deny identified accounts
 // const U32 PF_DENY_TRANSACTED			= 1 << 24;	// Deny identified accounts
 const U32 PF_ALLOW_GROUP_SCRIPTS		= 1 << 25;	// Allow scripts owned by group

indra/llmessage/aihttptimeoutpolicy.cpp

@@ -844,7 +844,12 @@ P(environmentRequestResponder);
 P(estateChangeInfoResponder);
 P(eventPollResponder);
 P(fetchInventoryResponder);
+P(fetchScriptLimitsAttachmentInfoResponder);
+P(fetchScriptLimitsRegionDetailsResponder);
+P(fetchScriptLimitsRegionInfoResponder);
+P(fetchScriptLimitsRegionSummaryResponder);
 P(fnPtrResponder);
+P2(gamingDataReceived,							transfer_18s);
 P2(groupMemberDataResponder,					transfer_300s);
 P2(groupProposalBallotResponder,				transfer_300s);
 P(homeLocationResponder);

indra/llmessage/llqueryflags.h

@@ -66,6 +66,8 @@ const U32 DFQ_INC_NEW_VIEWER	= (DFQ_INC_PG | DFQ_INC_MATURE | DFQ_INC_ADULT);	//
 
 const U32 DFQ_ADULT_SIMS_ONLY	= 0x1 << 27;
 
+const U32 DFQ_FILTER_GAMING		= 0x1 << 28;
+
 // Sell Type flags
 const U32 ST_AUCTION	= 0x1 << 1;
 const U32 ST_NEWBIE		= 0x1 << 2;

indra/llmessage/llregionflags.h

@@ -51,6 +51,8 @@ const U64 REGION_FLAGS_BLOCK_LAND_RESELL		= (1 << 7);
 
 // All content wiped once per night
 const U64 REGION_FLAGS_SANDBOX					= (1 << 8);
+const U64 REGION_FLAGS_GAMING					= (1 << 10); // Denotes a gaming region on certain grids
+const U64 REGION_FLAGS_HIDE_FROM_SEARCH			= (1 << 11); // Hides region from search on certain grids
 const U64 REGION_FLAGS_SKIP_COLLISIONS			= (1 << 12); // Pin all non agent rigid bodies
 const U64 REGION_FLAGS_SKIP_SCRIPTS				= (1 << 13);
 const U64 REGION_FLAGS_SKIP_PHYSICS				= (1 << 14); // Skip all physics
@@ -96,6 +98,18 @@ const U64 REGION_FLAGS_ESTATE_MASK = REGION_FLAGS_EXTERNALLY_VISIBLE
 									 | REGION_FLAGS_DENY_ANONYMOUS
 									 | REGION_FLAGS_DENY_AGEUNVERIFIED;
 
+// 'Gaming' flags
+const U32 REGION_GAMING_PRESENT					= (1 << 0);
+const U32 REGION_GAMING_HIDE_PARCEL				= (1 << 1);
+const U32 REGION_GAMING_HIDE_FIND_ALL			= (1 << 2);
+const U32 REGION_GAMING_HIDE_FIND_CLASSIFIEDS	= (1 << 3);
+const U32 REGION_GAMING_HIDE_FIND_EVENTS		= (1 << 4);
+const U32 REGION_GAMING_HIDE_FIND_LAND			= (1 << 5);
+const U32 REGION_GAMING_HIDE_FIND_SIMS			= (1 << 6);
+const U32 REGION_GAMING_HIDE_FIND_GROUPS		= (1 << 7);
+const U32 REGION_GAMING_HIDE_FIND_ALL_CLASSIC	= (1 << 8);
+const U32 REGION_GAMING_HIDE_GOD_FLOATER		= (1 << 9);
+
 inline BOOL is_prelude( U64 flags )
 {
 	// definition of prelude does not depend on fixed-sun

indra/llui/llmenugl.cpp

@@ -1945,7 +1945,7 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 	{
 		// SUBMENU
 		LLMenuGL *submenu = (LLMenuGL*)LLMenuGL::fromXML(child, parent, factory);
-		appendMenu(submenu);
+		appendMenu(submenu, 0);
 		if (LLMenuGL::sMenuContainer != NULL)
 		{
 			submenu->updateParent(LLMenuGL::sMenuContainer);
@@ -2214,18 +2214,27 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 	}
 }
 
+// This wrapper is needed because the virtual linkage causes errors if default parameters are used
 bool LLMenuGL::addChild(LLView* view, S32 tab_group)
+{
+	return addChild(view, 0, tab_group);
+}
+
+bool LLMenuGL::addChild(LLView* view, LLView* insert_before, S32 tab_group)
 {
 	if (LLMenuGL* menup = dynamic_cast<LLMenuGL*>(view))
 	{
 		lldebugs << "Adding menu " << menup->getName() << " to " << getName() << llendl;
-		appendMenu(menup);
+		if (!insert_before)
+			appendMenu(menup);
+		else
+			appendMenu(menup, insert_before);
 		return true;
 	}
 	else if (LLMenuItemGL* itemp = dynamic_cast<LLMenuItemGL*>(view))
 	{
 		lldebugs << "Adding " << itemp->getName() << " to " << getName() << llendl;
-		append(itemp);
+		append(itemp, insert_before);
 		return true;
 	}
 	lldebugs << "Error adding unknown child '"<<(view ? view->getName() : std::string("NULL")) << "' to " << getName() << llendl;
@@ -2712,10 +2721,29 @@ BOOL LLMenuGL::handleJumpKey(KEY key)
 
 
 // Add the menu item to this menu.
+// This wrapper is needed because the virtual linkage causes errors if default parameters are used
 BOOL LLMenuGL::append( LLMenuItemGL* item )
+{
+	return append(item, 0);
+}
+
+BOOL LLMenuGL::append(LLMenuItemGL* item, LLView* insert_before)
 {
 	if (!item) return FALSE;
+	if (!insert_before)
+	{
 	mItems.push_back( item );
+	}
+	else
+	{
+		item_list_t::iterator i;
+
+		for (i = mItems.begin(); i != mItems.end(); ++i)
+			if (*i == insert_before)
+				break;
+		mItems.insert(i, item);
+	}
+
 	LLUICtrl::addChild(item);
 	needsArrange();
 	return TRUE;
@@ -2729,7 +2757,13 @@ BOOL LLMenuGL::addSeparator()
 }
 
 // add a menu - this will create a cascading menu
+// This wrapper is needed because the virtual linkage causes errors if default parameters are used
 BOOL LLMenuGL::appendMenu( LLMenuGL* menu )
+{
+	return appendMenu(menu, 0);
+}
+
+BOOL LLMenuGL::appendMenu(LLMenuGL* menu, LLView* insert_before)
 {
 	if( menu == this )
 	{
@@ -2741,7 +2775,7 @@ BOOL LLMenuGL::appendMenu( LLMenuGL* menu )
 	LLMenuItemBranchGL* branch = NULL;
 	branch = new LLMenuItemBranchGL( menu->getName(), menu->getLabel(), menu->getHandle() );
 	branch->setJumpKey(menu->getJumpKey());
-	success &= append( branch );
+	success &= append( branch, insert_before );
 
 	// Inherit colors
 	menu->setBackgroundColor( mBackgroundColor );

indra/llui/llmenugl.h

@@ -476,6 +476,8 @@ public:
 	/*virtual*/ void removeChild( LLView* ctrl);
 	/*virtual*/ BOOL postBuild();
 
+	bool addChild(LLView* view, LLView* insert_before, S32 tab_group = 0);
+
 	virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
 
 	LLMenuGL* getChildMenuByName(const std::string& name, BOOL recurse) const;
@@ -572,11 +574,14 @@ public:
 protected:
 	void createSpilloverBranch();
 	void cleanupSpilloverBranch();
+
 	// Add the menu item to this menu.
 	virtual BOOL append( LLMenuItemGL* item );
+	BOOL append(LLMenuItemGL* item, LLView* insert_before);
 
 	// add a menu - this will create a cascading menu
 	virtual BOOL appendMenu( LLMenuGL* menu );
+	BOOL appendMenu(LLMenuGL* menu, LLView* insert_before);
 
 	// TODO: create accessor methods for these?
 	typedef std::list< LLMenuItemGL* > item_list_t;

indra/newview/CMakeLists.txt

@@ -244,6 +244,7 @@ set(viewer_SOURCE_FILES
     llfloaterregioninfo.cpp
     llfloaterreporter.cpp
     llfloaterscriptdebug.cpp
+    llfloaterscriptlimits.cpp
     llfloatersearchreplace.cpp
     llfloatersellland.cpp
     llfloatersettingsdebug.cpp
@@ -745,6 +746,7 @@ set(viewer_HEADER_FILES
     llfloaterregioninfo.h
     llfloaterreporter.h
     llfloaterscriptdebug.h
+    llfloaterscriptlimits.h
     llfloatersearchreplace.h
     llfloatersellland.h
     llfloatersettingsdebug.h

indra/newview/app_settings/settings.xml

@@ -5768,6 +5768,84 @@ This should be as low as possible, but too low may break functionality</string>
       <key>Value</key>
       <real>10.0</real>
     </map>
+    <key>FilterGamingSearchAll</key>
+    <map>
+      <key>Comment</key>
+      <string>Filter results flagged gaming in everything search</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>HideFromEditor</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FilterGamingClassifieds</key>
+    <map>
+      <key>Comment</key>
+      <string>Filter results flagged gaming in classifieds search</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>HideFromEditor</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FilterGamingEvents</key>
+    <map>
+      <key>Comment</key>
+      <string>Filter results flagged gaming in event search</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>HideFromEditor</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FilterGamingGroups</key>
+    <map>
+      <key>Comment</key>
+      <string>Filter results flagged gaming in groups search</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>HideFromEditor</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FilterGamingLand</key>
+    <map>
+      <key>Comment</key>
+      <string>Filter results flagged gaming in land search</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>HideFromEditor</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>FilterGamingSims</key>
+    <map>
+      <key>Comment</key>
+      <string>Filter results flagged gaming in sim search</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>HideFromEditor</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>FilterItemsPerFrame</key>
     <map>
       <key>Comment</key>
@@ -7072,6 +7150,22 @@ This should be as low as possible, but too low may break functionality</string>
         <integer>0</integer>
       </array>
     </map>
+    <key>FloaterScriptLimitsRect</key>
+    <map>
+      <key>Comment</key>
+      <string>Rectangle for Script Limits window</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>0</integer>
+        <integer>500</integer>
+        <integer>480</integer>
+        <integer>0</integer>
+      </array>
+    </map>
     <key>FloaterSnapshotRect</key>
     <map>
       <key>Comment</key>

indra/newview/hippogridmanager.cpp

@@ -357,7 +357,7 @@ std::string HippoGridInfo::getSearchUrl(SearchType ty, bool is_web) const
 			} 
 			else if (ty == SEARCH_ALL_TEMPLATE) 
 			{
-				return "lang=[LANG]&mat=[MATURITY]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]&session=[SESSION]";
+				return "lang=[LANG]&mat=[MATURITY]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]&session=[SESSION]&dice=[DICE]";
 			} 
 			else 
 			{
@@ -400,7 +400,7 @@ std::string HippoGridInfo::getSearchUrl(SearchType ty, bool is_web) const
 	    } 
 		else if (ty == SEARCH_ALL_TEMPLATE) 
 		{
-	    	return "lang=[LANG]&m=[MATURITY]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]&session=[SESSION]";
+			return "lang=[LANG]&m=[MATURITY]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]&session=[SESSION]&dice=[DICE]";
 	    } 
 		else 
 		{

indra/newview/llagent.cpp

@@ -4459,9 +4459,9 @@ void LLAgent::sendAgentSetAppearance()
 
 	body_size.mV[VX] += x_off;
 	body_size.mV[VY] += y_off;
-	body_size.mV[VZ] += z_off; // Offset by RLVa, but not overridden.
 // [RLVa:KB] - Checked: 2010-10-11 (RLVa-1.2.0e) | Added: RLVa-1.2.0e
-	body_size.mV[VZ] += RlvSettings::getAvatarOffsetZ();
+	F32 rlvz_off = RlvSettings::getAvatarOffsetZ();
+	body_size.mV[VZ] += fabs(rlvz_off) ? rlvz_off : z_off;
 // [/RLVa:KB]
 
 	msg->addVector3Fast(_PREHASH_Size, body_size);	

indra/newview/llappviewer.cpp

@@ -243,7 +243,6 @@ const F32 DEFAULT_AFK_TIMEOUT = 5.f * 60.f; // time with no input before user fl
 F32 gSimLastTime; // Used in LLAppViewer::init and send_stats()
 F32 gSimFrames;
 
-BOOL gAllowIdleAFK = FALSE;
 BOOL gAllowTapTapHoldRun = TRUE;
 BOOL gShowObjectUpdates = FALSE;
 BOOL gUseQuickTime = TRUE;
@@ -397,15 +396,16 @@ LLAppViewer::LLUpdaterInfo *LLAppViewer::sUpdaterInfo = NULL ;
 
 void idle_afk_check()
 {
+	static const LLCachedControl<bool> allow_idk_afk("AllowIdleAFK");
 	// check idle timers
 	static const LLCachedControl<F32> afk_timeout("AFKTimeout",0.f);
-	//if (gAllowIdleAFK && (gAwayTriggerTimer.getElapsedTimeF32() > gSavedSettings.getF32("AFKTimeout")))
+	//if (allow_idk_afk && (gAwayTriggerTimer.getElapsedTimeF32() > gSavedSettings.getF32("AFKTimeout")))
 // [RLVa:KB] - Checked: 2009-10-19 (RLVa-1.1.0g) | Added: RLVa-1.1.0g
 #ifdef RLV_EXTENSION_CMD_ALLOWIDLE
-	if ( (gAllowIdleAFK || gRlvHandler.hasBehaviour(RLV_BHVR_ALLOWIDLE)) && 
+	if ( (allow_idk_afk || gRlvHandler.hasBehaviour(RLV_BHVR_ALLOWIDLE)) &&
 		 (gAwayTriggerTimer.getElapsedTimeF32() > afk_timeout) && (afk_timeout > 0))
 #else
-	if (gAllowIdleAFK && (gAwayTriggerTimer.getElapsedTimeF32() > afk_timeout) && (afk_timeout > 0))
+	if (allow_idk_afk && (gAwayTriggerTimer.getElapsedTimeF32() > afk_timeout) && (afk_timeout > 0))
 #endif // RLV_EXTENSION_CMD_ALLOWIDLE
 // [/RLVa:KB]
 	{
@@ -504,7 +504,6 @@ static void settings_to_globals()
 	gAgent.setHideGroupTitle(gSavedSettings.getBOOL("RenderHideGroupTitle"));
 		
 	gDebugWindowProc = gSavedSettings.getBOOL("DebugWindowProc");
-	gAllowIdleAFK = gSavedSettings.getBOOL("AllowIdleAFK");
 	gAllowTapTapHoldRun = gSavedSettings.getBOOL("AllowTapTapHoldRun");
 	gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
 	LLWorldMapView::sMapScale =  llmax(.1f,gSavedSettings.getF32("MapScale"));
@@ -2675,7 +2674,6 @@ void LLAppViewer::cleanupSavedSettings()
 
 	gSavedSettings.setBOOL("DebugWindowProc", gDebugWindowProc);
 		
-	gSavedSettings.setBOOL("AllowIdleAFK", gAllowIdleAFK);
 	gSavedSettings.setBOOL("AllowTapTapHoldRun", gAllowTapTapHoldRun);
 	gSavedSettings.setBOOL("ShowObjectUpdates", gShowObjectUpdates);
 	

indra/newview/llappviewer.h

@@ -275,7 +275,6 @@ const S32 AGENT_UPDATES_PER_SECOND  = 10;
 
 extern LLSD gDebugInfo;
 
-extern BOOL	gAllowIdleAFK;
 extern BOOL	gAllowTapTapHoldRun;
 extern BOOL	gShowObjectUpdates;
 

indra/newview/llfloateravatarlist.cpp

@@ -876,7 +876,7 @@ void LLFloaterAvatarList::refreshAvatarList()
 		LLColor4 name_color = sDefaultListText;
 
 		//Lindens are always more Linden than your friend, make that take precedence
-		if(LLMuteList::getInstance()->isLinden(av_name))
+		if(LLMuteList::getInstance()->isLinden(av_id))
 		{
 			static const LLCachedControl<LLColor4> ascent_linden_color("AscentLindenColor",LLColor4(0.f,0.f,1.f,1.f));
 			name_color = ascent_linden_color;

indra/newview/llfloatergodtools.cpp

@@ -461,6 +461,10 @@ BOOL LLPanelRegionTools::postBuild()
 	getChild<LLUICtrl>("block terraform")->setCommitCallback(boost::bind(&LLPanelRegionTools::onChangeAnything, this));
 	getChild<LLUICtrl>("allow transfer")->setCommitCallback(boost::bind(&LLPanelRegionTools::onChangeAnything, this));
 	getChild<LLUICtrl>("is sandbox")->setCommitCallback( boost::bind(&LLPanelRegionTools::onChangeAnything, this));
+	getChild<LLUICtrl>("is gaming")->setVisible((gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_GOD_FLOATER));
+	getChild<LLUICtrl>("is gaming")->setCommitCallback(boost::bind(&LLPanelRegionTools::onChangeAnything, this));
+	getChild<LLUICtrl>("hide from search")->setVisible(!gHippoGridManager->getConnectedGrid()->isSecondLife());
+	getChild<LLUICtrl>("hide from search")->setCommitCallback(boost::bind(&LLPanelRegionTools::onChangeAnything, this));
 
 	childSetAction("Bake Terrain", boost::bind(&LLPanelRegionTools::onBakeTerrain, this));
 	childSetAction("Revert Terrain", boost::bind(&LLPanelRegionTools::onRevertTerrain, this));
@@ -670,6 +674,14 @@ U64 LLPanelRegionTools::getRegionFlags() const
 	{
 		flags |= REGION_FLAGS_SANDBOX;
 	}
+	if (getChild<LLUICtrl>("is gaming")->getValue().asBoolean())
+	{
+		flags |= REGION_FLAGS_GAMING;
+	}
+	if (getChild<LLUICtrl>("hide from search")->getValue().asBoolean())
+	{
+		flags |= REGION_FLAGS_HIDE_FROM_SEARCH;
+	}
 	return flags;
 }
 
@@ -708,6 +720,14 @@ U64 LLPanelRegionTools::getRegionFlagsMask() const
 	{
 		flags &= ~REGION_FLAGS_SANDBOX;
 	}
+	if (!getChild<LLUICtrl>("is gaming")->getValue().asBoolean())
+	{
+		flags &= ~REGION_FLAGS_GAMING;
+	}
+	if (!getChild<LLUICtrl>("hide from search")->getValue().asBoolean())
+	{
+		flags &= ~REGION_FLAGS_HIDE_FROM_SEARCH;
+	}
 	return flags;
 }
 
@@ -766,6 +786,8 @@ void LLPanelRegionTools::setCheckFlags(U64 flags)
 	getChild<LLUICtrl>("block terraform")->setValue(flags & REGION_FLAGS_BLOCK_TERRAFORM ? TRUE : FALSE);
 	getChild<LLUICtrl>("block dwell")->setValue(flags & REGION_FLAGS_BLOCK_DWELL ? TRUE : FALSE);
 	getChild<LLUICtrl>("is sandbox")->setValue(flags & REGION_FLAGS_SANDBOX ? TRUE : FALSE );
+	getChild<LLUICtrl>("is gaming")->setValue(flags & REGION_FLAGS_GAMING ? true : false);
+	getChild<LLUICtrl>("hide from search")->setValue(flags & REGION_FLAGS_HIDE_FROM_SEARCH ? true : false);
 }
 
 void LLPanelRegionTools::setBillableFactor(F32 billable_factor)

indra/newview/llfloaterland.cpp

@@ -48,15 +48,16 @@
 #include "llagent.h"
 #include "llagentaccess.h"
 #include "llavatarconstants.h" //For new Online check - HgB
-#include "llfloateravatarpicker.h"
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
 #include "llradiogroup.h"
 #include "llcombobox.h"
 #include "llfloaterauction.h"
 #include "llfloateravatarinfo.h"
+#include "llfloateravatarpicker.h"
 #include "llfloatergroups.h"
 #include "llfloatergroupinfo.h"
+#include "llfloaterscriptlimits.h"
 #include "lllineeditor.h"
 #include "llnamelistctrl.h"
 #include "llnotify.h"
@@ -221,8 +222,6 @@ LLFloaterLand::LLFloaterLand(const LLSD& seed)
 {
 	LLCallbackMap::map_t factory_map;
 	factory_map["land_general_panel"] = LLCallbackMap(createPanelLandGeneral, this);
-
-	
 	factory_map["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this);
 	factory_map["land_objects_panel"] = LLCallbackMap(createPanelLandObjects, this);
 	factory_map["land_options_panel"] = LLCallbackMap(createPanelLandOptions, this);
@@ -344,16 +343,15 @@ LLPanelLandGeneral::LLPanelLandGeneral(LLParcelSelectionHandle& parcel)
 BOOL LLPanelLandGeneral::postBuild()
 {
 	mEditName = getChild<LLLineEditor>("Name");
-	mEditName->setCommitCallback(onCommitAny);	
+	mEditName->setCommitCallback(onCommitAny, this);
-	childSetPrevalidate("Name", LLLineEditor::prevalidatePrintableNotPipe);
+	getChild<LLLineEditor>("Name")->setPrevalidate(LLLineEditor::prevalidatePrintableNotPipe);
-	childSetUserData("Name", this);
 
 	mEditDesc = getChild<LLTextEditor>("Description");
 	mEditDesc->setCommitOnFocusLost(TRUE);
-	mEditDesc->setCommitCallback(onCommitAny);	
+	mEditDesc->setCommitCallback(onCommitAny, this);
-	//childSetPrevalidate("Description",  LLLineEditor::prevalidatePrintableNotPipe);  Making Dummy View -HgB
+	// No prevalidate function - historically the prevalidate function was broken,
-	childSetUserData("Description", this);
+	// allowing residents to put in characters like U+2661 WHITE HEART SUIT, so
-
+	// preserve that ability.
 	
 	mTextSalePending = getChild<LLTextBox>("SalePending");
 	mTextOwnerLabel = getChild<LLTextBox>("Owner:");
@@ -363,7 +361,7 @@ BOOL LLPanelLandGeneral::postBuild()
 	mLandType = getChild<LLTextBox>("LandTypeText");
 	
 	mBtnProfile = getChild<LLButton>("Profile...");
-	mBtnProfile->setClickedCallback(onClickProfile, this);
+	mBtnProfile->setClickedCallback(boost::bind(&LLPanelLandGeneral::onClickProfile, this));
 
 	
 	mTextGroupLabel = getChild<LLTextBox>("Group:");
@@ -371,7 +369,7 @@ BOOL LLPanelLandGeneral::postBuild()
 
 	
 	mBtnSetGroup = getChild<LLButton>("Set...");
-	mBtnSetGroup->setClickedCallback(onClickSetGroup, this);
+	mBtnSetGroup->setCommitCallback(boost::bind(&LLPanelLandGeneral::onClickSetGroup, this));
 
 	getChild<LLButton>("group_profile")->setClickedCallback(onClickInfoGroup, this);
 
@@ -416,10 +414,30 @@ BOOL LLPanelLandGeneral::postBuild()
 
 	
 	mTextDwell = getChild<LLTextBox>("DwellText");
-
 	
 	mBtnBuyLand = getChild<LLButton>("Buy Land...");
 	mBtnBuyLand->setClickedCallback(onClickBuyLand, (void*)&BUY_PERSONAL_LAND);
+
+	// note: on region change this will not be re checked, should not matter on Agni as
+	// 99% of the time all regions will return the same caps. In case of an erroneous setting
+	// to enabled the floater will just throw an error when trying to get it's cap
+	std::string url = gAgent.getRegion()->getCapability("LandResources");
+	if (!url.empty())
+	{
+		mBtnScriptLimits = getChild<LLButton>("Scripts...");
+		if(mBtnScriptLimits)
+		{
+			mBtnScriptLimits->setClickedCallback(onClickScriptLimits, this);
+		}
+	}
+	else
+	{
+		mBtnScriptLimits = getChild<LLButton>("Scripts...");
+		if(mBtnScriptLimits)
+		{
+			mBtnScriptLimits->setVisible(false);
+		}
+	}
 	
 	mBtnBuyGroupLand = getChild<LLButton>("Buy For Group...");
 	mBtnBuyGroupLand->setClickedCallback(onClickBuyLand, (void*)&BUY_GROUP_LAND);
@@ -508,6 +526,7 @@ void LLPanelLandGeneral::refresh()
 		mTextDwell->setText(LLStringUtil::null);
 
 		mBtnBuyLand->setEnabled(FALSE);
+		mBtnScriptLimits->setEnabled(FALSE);
 		mBtnBuyGroupLand->setEnabled(FALSE);
 		mBtnReleaseLand->setEnabled(FALSE);
 		mBtnReclaimLand->setEnabled(FALSE);
@@ -723,6 +742,7 @@ void LLPanelLandGeneral::refresh()
 
 		mBtnBuyLand->setEnabled(
 			LLViewerParcelMgr::getInstance()->canAgentBuyParcel(parcel, false));
+		mBtnScriptLimits->setEnabled(true);
 		mBtnBuyGroupLand->setEnabled(
 			LLViewerParcelMgr::getInstance()->canAgentBuyParcel(parcel, true));
 
@@ -741,7 +761,7 @@ void LLPanelLandGeneral::refresh()
 			mBtnReleaseLand->setEnabled( can_release );
 		}
 
-		BOOL use_pass = parcel->getParcelFlag(PF_USE_PASS_LIST) && !LLViewerParcelMgr::getInstance()->isCollisionBanned();;
+		BOOL use_pass = parcel->getOwnerID()!= gAgent.getID() && parcel->getParcelFlag(PF_USE_PASS_LIST) && !LLViewerParcelMgr::getInstance()->isCollisionBanned();;
 		mBtnBuyPass->setEnabled(use_pass);
 	}
 }
@@ -805,22 +825,20 @@ void LLPanelLandGeneral::draw()
 	LLPanel::draw();
 }
 
-// static
+void LLPanelLandGeneral::onClickSetGroup()
-void LLPanelLandGeneral::onClickSetGroup(void* userdata)
 {
-	LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)userdata;
+	LLFloater* parent_floater = gFloaterView->getParentFloater(this);
-	LLFloaterGroupPicker* fg;
 
-	LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);
+	LLFloaterGroupPicker* fg = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
-
+	if (fg)
-	fg = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
-	fg->setSelectCallback( cbGroupID, userdata );
-
-	if (parent_floater)
 	{
-		LLRect new_rect = gFloaterView->findNeighboringPosition(parent_floater, fg);
+		fg->setSelectCallback( cbGroupID, this);
-		fg->setOrigin(new_rect.mLeft, new_rect.mBottom);
+		if (parent_floater)
-		parent_floater->addDependentFloater(fg);
+		{
+			LLRect new_rect = gFloaterView->findNeighboringPosition(parent_floater, fg);
+			fg->setOrigin(new_rect.mLeft, new_rect.mBottom);
+			parent_floater->addDependentFloater(fg);
+		}
 	}
 }
 
@@ -834,11 +852,9 @@ void LLPanelLandGeneral::onClickInfoGroup(void* userdata)
 	if(id.notNull())LLFloaterGroupInfo::showFromUUID(parcel->getGroupID());
 }
 
-// static
+void LLPanelLandGeneral::onClickProfile()
-void LLPanelLandGeneral::onClickProfile(void* data)
 {
-	LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)data;
+	LLParcel* parcel = mParcel->getParcel();
-	LLParcel* parcel = panelp->mParcel->getParcel();
 	if (!parcel) return;
 
 	if (parcel->getIsGroupOwned())
@@ -891,17 +907,15 @@ void LLPanelLandGeneral::onClickBuyLand(void* data)
 	LLViewerParcelMgr::getInstance()->startBuyLand(*for_group);
 }
 
-
+// static
-
+void LLPanelLandGeneral::onClickScriptLimits(void* data)
-
-
-
-
-BOOL LLPanelLandGeneral::enableDeedToGroup(void* data)
 {
 	LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)data;
 	LLParcel* parcel = panelp->mParcel->getParcel();
-	return (parcel != NULL) && (parcel->getParcelFlag(PF_ALLOW_DEED_TO_GROUP));
+	if(parcel != NULL)
+	{
+		LLFloaterScriptLimits::showInstance();
+	}
 }
 
 // static
@@ -954,6 +968,7 @@ void LLPanelLandGeneral::onClickBuyPass(void* data)
 
 	LLSD args;
 	args["COST"] = cost;
+	args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
 	args["PARCEL_NAME"] = parcel_name;
 	args["TIME"] = time;
 	
@@ -1844,6 +1859,7 @@ LLPanelLandOptions::LLPanelLandOptions(LLParcelSelectionHandle& parcel)
 	mSetBtn(NULL),
 	mClearBtn(NULL),
 	mMatureCtrl(NULL),
+	mGamingCtrl(NULL),
 	mPushRestrictionCtrl(NULL),
 	mSeeAvatarsCtrl(NULL),
 	mParcel(parcel),
@@ -1869,9 +1885,9 @@ BOOL LLPanelLandOptions::postBuild()
 	mCheckEditLand = getChild<LLCheckBoxCtrl>( "edit land check");
 	childSetCommitCallback("edit land check", onCommitAny, this);
 
-	
 	mCheckLandmark = getChild<LLCheckBoxCtrl>( "check landmark");
 	childSetCommitCallback("check landmark", onCommitAny, this);
+	mCheckLandmark->setVisible(!gHippoGridManager->getConnectedGrid()->isSecondLife());
 
 	
 	mCheckGroupScripts = getChild<LLCheckBoxCtrl>( "check group scripts");
@@ -1921,6 +1937,11 @@ BOOL LLPanelLandOptions::postBuild()
 
 	mMatureCtrl = getChild<LLCheckBoxCtrl>( "MatureCheck");
 	childSetCommitCallback("MatureCheck", onCommitAny, this);
+
+	mGamingCtrl = getChild<LLCheckBoxCtrl>( "GamingCheck");
+	childSetCommitCallback("GamingCheck", onCommitAny, this);
+	mGamingCtrl->setVisible((gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_PARCEL));
+	mGamingCtrl->setEnabled(false);
 	
 	mPublishHelpButton = getChild<LLButton>("?");
 	mPublishHelpButton->setClickedCallback(onClickPublishHelp, this);
@@ -1938,8 +1959,7 @@ BOOL LLPanelLandOptions::postBuild()
 	mSnapshotCtrl = getChild<LLTextureCtrl>("snapshot_ctrl");
 	if (mSnapshotCtrl)
 	{
-		mSnapshotCtrl->setCommitCallback( onCommitAny );
+		mSnapshotCtrl->setCommitCallback( onCommitAny, this );
-		mSnapshotCtrl->setCallbackUserData( this );
 		mSnapshotCtrl->setAllowNoTexture ( TRUE );
 		mSnapshotCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
 		mSnapshotCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
@@ -2029,6 +2049,7 @@ void LLPanelLandOptions::refresh()
 		mClearBtn->setEnabled(FALSE);
 
 		mMatureCtrl->setEnabled(FALSE);
+		mGamingCtrl->setEnabled(false);
 		mPublishHelpButton->setEnabled(FALSE);
 	}
 	else
@@ -2152,6 +2173,8 @@ void LLPanelLandOptions::refresh()
 				}
 			}
 		}
+		mGamingCtrl->set(parcel->getParcelFlag(PF_GAMING));
+		mGamingCtrl->setEnabled(can_change_options);
 	}
 }
 
@@ -2288,6 +2311,7 @@ void LLPanelLandOptions::onCommitAny(LLUICtrl *ctrl, void *userdata)
 	BOOL mature_publish		= self->mMatureCtrl->get();
 	BOOL push_restriction	= self->mPushRestrictionCtrl->get();
 	BOOL see_avs			= self->mSeeAvatarsCtrl->get();
+	bool gaming				= self->mGamingCtrl->get();
 	BOOL show_directory		= self->mCheckShowDirectory->get();
 	// we have to get the index from a lookup, not from the position in the dropdown!
 	S32  category_index		= LLParcel::getCategoryFromString(self->mCategoryCombo->getSelectedValue());
@@ -2296,11 +2320,16 @@ void LLPanelLandOptions::onCommitAny(LLUICtrl *ctrl, void *userdata)
 	LLViewerRegion* region;
 	region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
 
-	if (!allow_other_scripts && region && region->getAllowDamage())
+	if (region && region->getAllowDamage())
-	{
+	{	// Damage is allowed on the region - server will always allow scripts
-
+		if ( (!allow_other_scripts && parcel->getParcelFlag(PF_ALLOW_OTHER_SCRIPTS)) ||
-		LLNotificationsUtil::add("UnableToDisableOutsideScripts");
+			 (!allow_group_scripts && parcel->getParcelFlag(PF_ALLOW_GROUP_SCRIPTS)) )
-		return;
+		{	// Don't allow turning off "Run Scripts" if damage is allowed in the region
+			self->mCheckOtherScripts->set(parcel->getParcelFlag(PF_ALLOW_OTHER_SCRIPTS));	// Restore UI to actual settings
+			self->mCheckGroupScripts->set(parcel->getParcelFlag(PF_ALLOW_GROUP_SCRIPTS));
+			LLNotificationsUtil::add("UnableToDisableOutsideScripts");
+			return;
+		}
 	}
 
 	// Push data into current parcel
@@ -2317,6 +2346,7 @@ void LLPanelLandOptions::onCommitAny(LLUICtrl *ctrl, void *userdata)
 	parcel->setParcelFlag(PF_SHOW_DIRECTORY, show_directory);
 	parcel->setParcelFlag(PF_ALLOW_PUBLISH, allow_publish);
 	parcel->setParcelFlag(PF_MATURE_PUBLISH, mature_publish);
+	parcel->setParcelFlag(PF_GAMING, gaming);
 	parcel->setParcelFlag(PF_RESTRICT_PUSHOBJECT, push_restriction);
 	parcel->setCategory((LLParcel::ECategory)category_index);
 	parcel->setLandingType((LLParcel::ELandingType)landing_type_index);
@@ -2419,9 +2449,9 @@ BOOL LLPanelLandAccess::postBuild()
 	childSetCommitCallback("PriceSpin", onCommitAny, this);
 	childSetCommitCallback("HoursSpin", onCommitAny, this);
 
-	childSetAction("add_allowed", onClickAddAccess, this);
+	childSetAction("add_allowed", boost::bind(&LLPanelLandAccess::onClickAddAccess, this));
 	childSetAction("remove_allowed", onClickRemoveAccess, this);
-	childSetAction("add_banned", onClickAddBanned, this);
+	childSetAction("add_banned", boost::bind(&LLPanelLandAccess::onClickAddBanned, this));
 	childSetAction("remove_banned", onClickRemoveBanned, this);
 	
 	mListAccess = getChild<LLNameListCtrl>("AccessList");
@@ -2456,12 +2486,12 @@ void LLPanelLandAccess::refresh()
 		BOOL use_group = parcel->getParcelFlag(PF_USE_ACCESS_GROUP);
 		BOOL public_access = !use_access_list && !use_group;
 		
-		childSetValue("public_access", public_access );
+		getChild<LLUICtrl>("public_access")->setValue(public_access );
-		childSetValue("GroupCheck", use_group );
+		getChild<LLUICtrl>("GroupCheck")->setValue(use_group );
 
 		std::string group_name;
 		gCacheName->getGroupName(parcel->getGroupID(), group_name);
-		childSetLabelArg("GroupCheck", "[GROUP]", group_name );
+		getChild<LLUICtrl>("GroupCheck")->setLabelArg("[GROUP]", group_name );
 		
 		// Allow list
 		if (mListAccess)
@@ -2470,8 +2500,8 @@ void LLPanelLandAccess::refresh()
 			mListAccess->clearSortOrder();
 			mListAccess->deleteAllItems();
 			S32 count = parcel->mAccessList.size();
-			childSetToolTipArg("AccessList", "[LISTED]", llformat("%d",count));
+			getChild<LLUICtrl>("AccessList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",count));
-			childSetToolTipArg("AccessList", "[MAX]", llformat("%d",PARCEL_MAX_ACCESS_LIST));
+			getChild<LLUICtrl>("AccessList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST));
 
 			for (access_map_const_iterator cit = parcel->mAccessList.begin();
 				 cit != parcel->mAccessList.end(); ++cit)
@@ -2517,8 +2547,8 @@ void LLPanelLandAccess::refresh()
 			mListBanned->deleteAllItems();
 			S32 count = parcel->mBanList.size();
 
-			childSetToolTipArg("BannedList", "[LISTED]", llformat("%d",count));
+			getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",count));
-			childSetToolTipArg("BannedList", "[MAX]", llformat("%d",PARCEL_MAX_ACCESS_LIST));
+			getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST));
 
 			for (access_map_const_iterator cit = parcel->mBanList.begin();
 				 cit != parcel->mBanList.end(); ++cit)
@@ -2558,23 +2588,23 @@ void LLPanelLandAccess::refresh()
 
 		if(parcel->getRegionDenyAnonymousOverride())
 		{
-			childSetValue("limit_payment", TRUE);
+			getChild<LLUICtrl>("limit_payment")->setValue(TRUE);
 		}
 		else
 		{
-			childSetValue("limit_payment", (parcel->getParcelFlag(PF_DENY_ANONYMOUS)));
+			getChild<LLUICtrl>("limit_payment")->setValue((parcel->getParcelFlag(PF_DENY_ANONYMOUS)));
 		}
 		if(parcel->getRegionDenyAgeUnverifiedOverride())
 		{
-			childSetValue("limit_age_verified", TRUE);
+			getChild<LLUICtrl>("limit_age_verified")->setValue(TRUE);
 		}
 		else
 		{
-			childSetValue("limit_age_verified", (parcel->getParcelFlag(PF_DENY_AGEUNVERIFIED)));
+			getChild<LLUICtrl>("limit_age_verified")->setValue((parcel->getParcelFlag(PF_DENY_AGEUNVERIFIED)));
 		}
 		
 		BOOL use_pass = parcel->getParcelFlag(PF_USE_PASS_LIST);
-		childSetValue("PassCheck",  use_pass );
+		getChild<LLUICtrl>("PassCheck")->setValue(use_pass );
 		LLCtrlSelectionInterface* passcombo = childGetSelectionInterface("pass_combo");
 		if (passcombo)
 		{
@@ -2585,41 +2615,41 @@ void LLPanelLandAccess::refresh()
 		}
 		
 		S32 pass_price = parcel->getPassPrice();
-		childSetValue( "PriceSpin", (F32)pass_price );
+		getChild<LLUICtrl>("PriceSpin")->setValue((F32)pass_price );
-		childSetLabelArg("PriceSpin", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+		getChild<LLUICtrl>("PriceSpin")->setLabelArg("[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 
 		F32 pass_hours = parcel->getPassHours();
-		childSetValue( "HoursSpin", pass_hours );
+		getChild<LLUICtrl>("HoursSpin")->setValue(pass_hours );
 	}
 	else
 	{
-		childSetValue("public_access", FALSE);
+		getChild<LLUICtrl>("public_access")->setValue(FALSE);
-		childSetValue("limit_payment", FALSE);
+		getChild<LLUICtrl>("limit_payment")->setValue(FALSE);
-		childSetValue("limit_age_verified", FALSE);
+		getChild<LLUICtrl>("limit_age_verified")->setValue(FALSE);
-		childSetValue("GroupCheck", FALSE);
+		getChild<LLUICtrl>("GroupCheck")->setValue(FALSE);
-		childSetLabelArg("GroupCheck", "[GROUP]", LLStringUtil::null );
+		getChild<LLUICtrl>("GroupCheck")->setLabelArg("[GROUP]", LLStringUtil::null );
-		childSetValue("PassCheck", FALSE);
+		getChild<LLUICtrl>("PassCheck")->setValue(FALSE);
-		childSetValue("PriceSpin", (F32)PARCEL_PASS_PRICE_DEFAULT);
+		getChild<LLUICtrl>("PriceSpin")->setValue((F32)PARCEL_PASS_PRICE_DEFAULT);
-		childSetValue( "HoursSpin", PARCEL_PASS_HOURS_DEFAULT );
+		getChild<LLUICtrl>("HoursSpin")->setValue(PARCEL_PASS_HOURS_DEFAULT );
-		childSetToolTipArg("AccessList", "[LISTED]", llformat("%d",0));
+		getChild<LLUICtrl>("AccessList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",0));
-		childSetToolTipArg("AccessList", "[MAX]", llformat("%d",0));
+		getChild<LLUICtrl>("AccessList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",0));
-		childSetToolTipArg("BannedList", "[LISTED]", llformat("%d",0));
+		getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",0));
-		childSetToolTipArg("BannedList", "[MAX]", llformat("%d",0));
+		getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",0));
 	}	
 }
 
 void LLPanelLandAccess::refresh_ui()
 {
-	childSetEnabled("public_access", FALSE);
+	getChildView("public_access")->setEnabled(FALSE);
-	childSetEnabled("limit_payment", FALSE);
+	getChildView("limit_payment")->setEnabled(FALSE);
-	childSetEnabled("limit_age_verified", FALSE);
+	getChildView("limit_age_verified")->setEnabled(FALSE);
-	childSetEnabled("GroupCheck", FALSE);
+	getChildView("GroupCheck")->setEnabled(FALSE);
-	childSetEnabled("PassCheck", FALSE);
+	getChildView("PassCheck")->setEnabled(FALSE);
-	childSetEnabled("pass_combo", FALSE);
+	getChildView("pass_combo")->setEnabled(FALSE);
-	childSetEnabled("PriceSpin", FALSE);
+	getChildView("PriceSpin")->setEnabled(FALSE);
-	childSetEnabled("HoursSpin", FALSE);
+	getChildView("HoursSpin")->setEnabled(FALSE);
-	childSetEnabled("AccessList", FALSE);
+	getChildView("AccessList")->setEnabled(FALSE);
-	childSetEnabled("BannedList", FALSE);
+	getChildView("BannedList")->setEnabled(FALSE);
 	
 	LLParcel *parcel = mParcel->getParcel();
 	if (parcel)
@@ -2627,73 +2657,73 @@ void LLPanelLandAccess::refresh_ui()
 		BOOL can_manage_allowed = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_MANAGE_ALLOWED);
 		BOOL can_manage_banned = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_MANAGE_BANNED);
 	
-		childSetEnabled("public_access", can_manage_allowed);
+		getChildView("public_access")->setEnabled(can_manage_allowed);
-		BOOL public_access = childGetValue("public_access").asBoolean();
+		BOOL public_access = getChild<LLUICtrl>("public_access")->getValue().asBoolean();
 		if (public_access)
 		{
 			bool override = false;
 			if(parcel->getRegionDenyAnonymousOverride())
 			{
 				override = true;
-				childSetEnabled("limit_payment", FALSE);
+				getChildView("limit_payment")->setEnabled(FALSE);
 			}
 			else
 			{
-				childSetEnabled("limit_payment", can_manage_allowed);
+				getChildView("limit_payment")->setEnabled(can_manage_allowed);
 			}
 			if(parcel->getRegionDenyAgeUnverifiedOverride())
 			{
 				override = true;
-				childSetEnabled("limit_age_verified", FALSE);
+				getChildView("limit_age_verified")->setEnabled(FALSE);
 			}
 			else
 			{
-				childSetEnabled("limit_age_verified", can_manage_allowed);
+				getChildView("limit_age_verified")->setEnabled(can_manage_allowed);
 			}
 			if (override)
 			{
-				childSetToolTip("Only Allow", getString("estate_override"));
+				getChildView("Only Allow")->setToolTip(getString("estate_override"));
 			}
 			else
 			{
-				childSetToolTip("Only Allow", std::string());
+				getChildView("Only Allow")->setToolTip(std::string());
 			}
-			childSetEnabled("GroupCheck", FALSE);
+			getChildView("GroupCheck")->setEnabled(FALSE);
-			childSetEnabled("PassCheck", FALSE);
+			getChildView("PassCheck")->setEnabled(FALSE);
-			childSetEnabled("pass_combo", FALSE);
+			getChildView("pass_combo")->setEnabled(FALSE);
-			childSetEnabled("AccessList", FALSE);
+			getChildView("AccessList")->setEnabled(FALSE);
 		}
 		else
 		{
-			childSetEnabled("limit_payment", FALSE);
+			getChildView("limit_payment")->setEnabled(FALSE);
-			childSetEnabled("limit_age_verified", FALSE);
+			getChildView("limit_age_verified")->setEnabled(FALSE);
 
 			std::string group_name;
 			if (gCacheName->getGroupName(parcel->getGroupID(), group_name))
 			{			
-				childSetEnabled("GroupCheck", can_manage_allowed);
+				getChildView("GroupCheck")->setEnabled(can_manage_allowed);
 			}
-			BOOL group_access = childGetValue("GroupCheck").asBoolean();
+			BOOL group_access = getChild<LLUICtrl>("GroupCheck")->getValue().asBoolean();
-			BOOL sell_passes = childGetValue("PassCheck").asBoolean();
+			BOOL sell_passes = getChild<LLUICtrl>("PassCheck")->getValue().asBoolean();
-			childSetEnabled("PassCheck", can_manage_allowed);
+			getChildView("PassCheck")->setEnabled(can_manage_allowed);
 			if (sell_passes)
 			{
-				childSetEnabled("pass_combo", group_access && can_manage_allowed);
+				getChildView("pass_combo")->setEnabled(group_access && can_manage_allowed);
-				childSetEnabled("PriceSpin", can_manage_allowed);
+				getChildView("PriceSpin")->setEnabled(can_manage_allowed);
-				childSetEnabled("HoursSpin", can_manage_allowed);
+				getChildView("HoursSpin")->setEnabled(can_manage_allowed);
 			}
 		}
-		childSetEnabled("AccessList", can_manage_allowed);
+		getChildView("AccessList")->setEnabled(can_manage_allowed);
 		S32 allowed_list_count = parcel->mAccessList.size();
-		childSetEnabled("add_allowed", can_manage_allowed && allowed_list_count < PARCEL_MAX_ACCESS_LIST);
+		getChildView("add_allowed")->setEnabled(can_manage_allowed && allowed_list_count < PARCEL_MAX_ACCESS_LIST);
-		BOOL has_selected = mListAccess->getSelectionInterface()->getFirstSelectedIndex() >= 0;
+		BOOL has_selected = (mListAccess && mListAccess->getSelectionInterface()->getFirstSelectedIndex() >= 0);
-		childSetEnabled("remove_allowed", can_manage_allowed && has_selected);
+		getChildView("remove_allowed")->setEnabled(can_manage_allowed && has_selected);
 		
-		childSetEnabled("BannedList", can_manage_banned);
+		getChildView("BannedList")->setEnabled(can_manage_banned);
 		S32 banned_list_count = parcel->mBanList.size();
-		childSetEnabled("add_banned", can_manage_banned && banned_list_count < PARCEL_MAX_ACCESS_LIST);
+		getChildView("add_banned")->setEnabled(can_manage_banned && banned_list_count < PARCEL_MAX_ACCESS_LIST);
-		has_selected = mListBanned->getSelectionInterface()->getFirstSelectedIndex() >= 0;
+		has_selected = (mListBanned && mListBanned->getSelectionInterface()->getFirstSelectedIndex() >= 0);
-		childSetEnabled("remove_banned", can_manage_banned && has_selected);
+		getChildView("remove_banned")->setEnabled(can_manage_banned && has_selected);
 	}
 }
 		
@@ -2707,7 +2737,7 @@ void LLPanelLandAccess::refreshNames()
 	{
 		gCacheName->getGroupName(parcel->getGroupID(), group_name);
 	}
-	childSetLabelArg("GroupCheck", "[GROUP]", group_name);
+	getChild<LLUICtrl>("GroupCheck")->setLabelArg("[GROUP]", group_name);
 }
 
 
@@ -2730,13 +2760,13 @@ void LLPanelLandAccess::onCommitPublicAccess(LLUICtrl *ctrl, void *userdata)
 	}
 
 	// If we disabled public access, enable group access by default (if applicable)
-	BOOL public_access = self->childGetValue("public_access").asBoolean();
+	BOOL public_access = self->getChild<LLUICtrl>("public_access")->getValue().asBoolean();
 	if (public_access == FALSE)
 	{
 		std::string group_name;
 		if (gCacheName->getGroupName(parcel->getGroupID(), group_name))
 		{
-			self->childSetValue("GroupCheck", public_access ? FALSE : TRUE);
+			self->getChild<LLUICtrl>("GroupCheck")->setValue(public_access ? FALSE : TRUE);
 		}
 	}
 	
@@ -2755,8 +2785,8 @@ void LLPanelLandAccess::onCommitAny(LLUICtrl *ctrl, void *userdata)
 	}
 
 	// Extract data from UI
-	BOOL public_access = self->childGetValue("public_access").asBoolean();
+	BOOL public_access = self->getChild<LLUICtrl>("public_access")->getValue().asBoolean();
-	BOOL use_access_group = self->childGetValue("GroupCheck").asBoolean();
+	BOOL use_access_group = self->getChild<LLUICtrl>("GroupCheck")->getValue().asBoolean();
 	if (use_access_group)
 	{
 		std::string group_name;
@@ -2774,13 +2804,13 @@ void LLPanelLandAccess::onCommitAny(LLUICtrl *ctrl, void *userdata)
 	{
 		use_access_list = FALSE;
 		use_access_group = FALSE;
-		limit_payment = self->childGetValue("limit_payment").asBoolean();
+		limit_payment = self->getChild<LLUICtrl>("limit_payment")->getValue().asBoolean();
-		limit_age_verified = self->childGetValue("limit_age_verified").asBoolean();
+		limit_age_verified = self->getChild<LLUICtrl>("limit_age_verified")->getValue().asBoolean();
 	}
 	else
 	{
 		use_access_list = TRUE;
-		use_pass_list = self->childGetValue("PassCheck").asBoolean();
+		use_pass_list = self->getChild<LLUICtrl>("PassCheck")->getValue().asBoolean();
 		if (use_access_group && use_pass_list)
 		{
 			LLCtrlSelectionInterface* passcombo = self->childGetSelectionInterface("pass_combo");
@@ -2794,8 +2824,8 @@ void LLPanelLandAccess::onCommitAny(LLUICtrl *ctrl, void *userdata)
 		}
 	}
 
-	S32 pass_price = llfloor((F32)self->childGetValue("PriceSpin").asReal());
+	S32 pass_price = llfloor((F32)self->getChild<LLUICtrl>("PriceSpin")->getValue().asReal());
-	F32 pass_hours = (F32)self->childGetValue("HoursSpin").asReal();
+	F32 pass_hours = (F32)self->getChild<LLUICtrl>("HoursSpin")->getValue().asReal();
 
 	// Push data into current parcel
 	parcel->setParcelFlag(PF_USE_ACCESS_GROUP,	use_access_group);
@@ -2815,13 +2845,13 @@ void LLPanelLandAccess::onCommitAny(LLUICtrl *ctrl, void *userdata)
 	self->refresh();
 }
 
-// static
+void LLPanelLandAccess::onClickAddAccess()
-void LLPanelLandAccess::onClickAddAccess(void* data)
 {
-	LLPanelLandAccess* panelp = (LLPanelLandAccess*)data;
+	LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(
-	if (panelp)
+		boost::bind(&LLPanelLandAccess::callbackAvatarCBAccess, this, _1));
+	if (picker)
 	{
-		gFloaterView->getParentFloater(panelp)->addDependentFloater(LLFloaterAvatarPicker::show(boost::bind(&LLPanelLandAccess::callbackAvatarCBAccess, panelp, _1)));
+		gFloaterView->getParentFloater(this)->addDependentFloater(picker);
 	}
 }
 
@@ -2863,11 +2893,14 @@ void LLPanelLandAccess::onClickRemoveAccess(void* data)
 	}
 }
 
-// static
+void LLPanelLandAccess::onClickAddBanned()
-void LLPanelLandAccess::onClickAddBanned(void* data)
 {
-	LLPanelLandAccess* panelp = (LLPanelLandAccess*)data;
+	LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(
-	gFloaterView->getParentFloater(panelp)->addDependentFloater(LLFloaterAvatarPicker::show(boost::bind(&LLPanelLandAccess::callbackAvatarCBBanned, panelp, _1)));
+		boost::bind(&LLPanelLandAccess::callbackAvatarCBBanned, this, _1));
+	if (picker)
+	{
+		gFloaterView->getParentFloater(this)->addDependentFloater(picker);
+	}
 }
 
 void LLPanelLandAccess::callbackAvatarCBBanned(const uuid_vec_t& ids)

indra/newview/llfloaterland.h

@@ -49,11 +49,11 @@ class LLButton;
 class LLCheckBoxCtrl;
 class LLRadioGroup;
 class LLComboBox;
-class LLNameListCtrl;
-class LLSpinCtrl;
 class LLLineEditor;
+class LLNameListCtrl;
 class LLRadioGroup;
 class LLParcelSelectionObserver;
+class LLSpinCtrl;
 class LLTabContainer;
 class LLTextBox;
 class LLTextEditor;
@@ -149,13 +149,13 @@ public:
 	virtual void draw();
 
 	void setGroup(const LLUUID& group_id);
-	static void onClickProfile(void*);
+	void onClickProfile();
-	static void onClickSetGroup(void*);
+	void onClickSetGroup();
 	static void onClickInfoGroup(void*);
 	static void cbGroupID(LLUUID group_id, void* userdata);
-	static BOOL enableDeedToGroup(void*);
 	static void onClickDeed(void*);
 	static void onClickBuyLand(void* data);
+	static void onClickScriptLimits(void* data);
 	static void onClickRelease(void*);
 	static void onClickReclaim(void*);
 	static void onClickBuyPass(void* deselect_when_done);
@@ -225,6 +225,7 @@ protected:
 	LLTextBox*		mTextDwell;
 
 	LLButton*		mBtnBuyLand;
+	LLButton*		mBtnScriptLimits;
 	LLButton*		mBtnBuyGroupLand;
 
 	// these buttons share the same location, but
@@ -361,6 +362,7 @@ private:
 	LLButton*		mClearBtn;
 
 	LLCheckBoxCtrl		*mMatureCtrl;
+	LLCheckBoxCtrl		*mGamingCtrl;
 	LLCheckBoxCtrl		*mPushRestrictionCtrl;
 	LLCheckBoxCtrl		*mSeeAvatarsCtrl;
 	LLButton			*mPublishHelpButton;
@@ -382,15 +384,16 @@ public:
 
 	static void onCommitPublicAccess(LLUICtrl* ctrl, void *userdata);
 	static void onCommitAny(LLUICtrl* ctrl, void *userdata);
-	static void onClickAddAccess(void*);
-	void callbackAvatarCBAccess(const uuid_vec_t& ids);
 	static void onClickRemoveAccess(void*);
-	static void onClickAddBanned(void*);
-	void callbackAvatarCBBanned(const uuid_vec_t& ids);
 	static void onClickRemoveBanned(void*);
 
 	virtual BOOL postBuild();
 
+	void onClickAddAccess();
+	void onClickAddBanned();
+	void callbackAvatarCBBanned(const uuid_vec_t& ids);
+	void callbackAvatarCBAccess(const uuid_vec_t& ids);
+
 protected:
 	LLNameListCtrl*		mListAccess;
 	LLNameListCtrl*		mListBanned;

indra/newview/llfloaterscriptlimits.h

@@ -0,0 +1,271 @@
+/**
+ * @file llfloaterscriptlimits.h
+ * @author Gabriel Lee
+ * @brief Declaration of the region info and controls floater and panels.
+ *
+ * $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_LLFLOATERSCRIPTLIMITS_H
+#define LL_LLFLOATERSCRIPTLIMITS_H
+
+#include <vector>
+#include "llfloater.h"
+#include "llhost.h"
+#include "llpanel.h"
+#include "llremoteparcelrequest.h"
+
+class LLPanelScriptLimitsInfo;
+class LLTabContainer;
+
+class LLPanelScriptLimitsRegionMemory;
+
+class LLFloaterScriptLimits : public LLFloater, public LLFloaterSingleton<LLFloaterScriptLimits>
+{
+	friend class LLUISingleton<LLFloaterScriptLimits, VisibilityPolicy<LLFloater> >;
+public:
+
+	/*virtual*/ BOOL postBuild();
+
+	// from LLPanel
+	virtual void refresh();
+
+private:
+
+	LLFloaterScriptLimits(const LLSD& seed);
+	~LLFloaterScriptLimits();
+
+protected:
+
+	LLTabContainer* mTab;
+	typedef std::vector<LLPanelScriptLimitsInfo*> info_panels_t;
+	info_panels_t mInfoPanels;
+};
+
+
+// Base class for all script limits information panels.
+class LLPanelScriptLimitsInfo : public LLPanel
+{
+public:
+	LLPanelScriptLimitsInfo();
+
+	virtual BOOL postBuild();
+	virtual void updateChild(LLUICtrl* child_ctrl);
+
+protected:
+	void initCtrl(const std::string& name);
+
+	typedef std::vector<std::string> strings_t;
+
+	LLHost mHost;
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// Responders
+/////////////////////////////////////////////////////////////////////////////
+class AIHTTPTimeoutPolicy;
+
+extern AIHTTPTimeoutPolicy fetchScriptLimitsRegionInfoResponder_timeout;
+class fetchScriptLimitsRegionInfoResponder: public LLHTTPClient::ResponderWithResult
+{
+	public:
+		fetchScriptLimitsRegionInfoResponder(const LLSD& info) : mInfo(info) {};
+
+		void result(const LLSD& content);
+		void error(U32 status, const std::string& reason);
+	public:
+		/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return fetchScriptLimitsRegionInfoResponder_timeout; }
+		/*virtual*/ char const* getName(void) const { return "fetchScriptLimitsRegionInfoResponder"; }
+	protected:
+		LLSD mInfo;
+};
+
+extern AIHTTPTimeoutPolicy fetchScriptLimitsRegionSummaryResponder_timeout;
+class fetchScriptLimitsRegionSummaryResponder: public LLHTTPClient::ResponderWithResult
+{
+	public:
+		fetchScriptLimitsRegionSummaryResponder(const LLSD& info) : mInfo(info) {};
+
+		void result(const LLSD& content);
+		void error(U32 status, const std::string& reason);
+	public:
+		/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return fetchScriptLimitsRegionSummaryResponder_timeout; }
+		/*virtual*/ char const* getName(void) const { return "fetchScriptLimitsRegionSummaryResponder"; }
+	protected:
+		LLSD mInfo;
+};
+
+extern AIHTTPTimeoutPolicy fetchScriptLimitsRegionDetailsResponder_timeout;
+class fetchScriptLimitsRegionDetailsResponder: public LLHTTPClient::ResponderWithResult
+{
+	public:
+		fetchScriptLimitsRegionDetailsResponder(const LLSD& info) : mInfo(info) {};
+
+		void result(const LLSD& content);
+		void error(U32 status, const std::string& reason);
+	public:
+		/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return fetchScriptLimitsRegionDetailsResponder_timeout; }
+		/*virtual*/ char const* getName(void) const { return "fetchScriptLimitsRegionDetailsResponder"; }
+	protected:
+		LLSD mInfo;
+};
+
+extern AIHTTPTimeoutPolicy fetchScriptLimitsAttachmentInfoResponder_timeout;
+class fetchScriptLimitsAttachmentInfoResponder: public LLHTTPClient::ResponderWithResult
+{
+	public:
+		fetchScriptLimitsAttachmentInfoResponder() {};
+
+		void result(const LLSD& content);
+		void error(U32 status, const std::string& reason);
+	public:
+		/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return fetchScriptLimitsAttachmentInfoResponder_timeout; }
+		/*virtual*/ char const* getName(void) const { return "fetchScriptLimitsAttachmentInfoResponder"; }
+	protected:
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// Memory panel
+/////////////////////////////////////////////////////////////////////////////
+
+class LLPanelScriptLimitsRegionMemory : public LLPanelScriptLimitsInfo, LLRemoteParcelInfoObserver
+{
+
+public:
+	LLPanelScriptLimitsRegionMemory()
+		: LLPanelScriptLimitsInfo(), LLRemoteParcelInfoObserver(),
+
+		mParcelId(LLUUID()),
+		mGotParcelMemoryUsed(false),
+		mGotParcelMemoryMax(false),
+		mParcelMemoryMax(0),
+		mParcelMemoryUsed(0) {};
+
+	~LLPanelScriptLimitsRegionMemory();
+
+	// LLPanel
+	virtual BOOL postBuild();
+
+	void setRegionDetails(LLSD content);
+	void setRegionSummary(LLSD content);
+
+	BOOL StartRequestChain();
+
+	BOOL getLandScriptResources();
+	void clearList();
+	void showBeacon();
+	void returnObjectsFromParcel(S32 local_id);
+	void returnObjects();
+
+private:
+	void onNameCache(const LLUUID& id,
+						 const std::string& name);
+
+	LLSD mContent;
+	LLUUID mParcelId;
+	bool mGotParcelMemoryUsed;
+	bool mGotParcelMemoryUsedDetails;
+	bool mGotParcelMemoryMax;
+	S32 mParcelMemoryMax;
+	S32 mParcelMemoryUsed;
+	S32 mParcelMemoryUsedDetails;
+
+	bool mGotParcelURLsUsed;
+	bool mGotParcelURLsUsedDetails;
+	bool mGotParcelURLsMax;
+	S32 mParcelURLsMax;
+	S32 mParcelURLsUsed;
+	S32 mParcelURLsUsedDetails;
+
+	std::vector<LLSD> mObjectListItems;
+
+protected:
+
+// LLRemoteParcelInfoObserver interface:
+/*virtual*/ void processParcelInfo(const LLParcelData& parcel_data);
+/*virtual*/ void setParcelID(const LLUUID& parcel_id);
+/*virtual*/ void setErrorStatus(U32 status, const std::string& reason);
+
+	static void onClickRefresh(void* userdata);
+	static void onClickHighlight(void* userdata);
+	static void onClickReturn(void* userdata);
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// Attachment panel
+/////////////////////////////////////////////////////////////////////////////
+
+class LLPanelScriptLimitsAttachment : public LLPanelScriptLimitsInfo
+{
+
+public:
+	LLPanelScriptLimitsAttachment()
+		:	LLPanelScriptLimitsInfo(),
+		mGotAttachmentMemoryUsed(false),
+		mGotAttachmentMemoryUsedDetails(false),
+		mGotAttachmentMemoryMax(false),
+		mAttachmentMemoryMax(0),
+		mAttachmentMemoryUsed(0),
+		mAttachmentMemoryUsedDetails(0),
+		mGotAttachmentURLsUsed(false),
+		mGotAttachmentURLsUsedDetails(false),
+		mGotAttachmentURLsMax(false),
+		mAttachmentURLsMax(0),
+		mAttachmentURLsUsed(0),
+		mAttachmentURLsUsedDetails(0)
+		{};
+
+	~LLPanelScriptLimitsAttachment()
+	{
+	};
+
+	// LLPanel
+	virtual BOOL postBuild();
+
+	void setAttachmentDetails(LLSD content);
+
+	void setAttachmentSummary(LLSD content);
+	BOOL requestAttachmentDetails();
+	void clearList();
+
+private:
+
+	bool mGotAttachmentMemoryUsed;
+	bool mGotAttachmentMemoryUsedDetails;
+	bool mGotAttachmentMemoryMax;
+	S32 mAttachmentMemoryMax;
+	S32 mAttachmentMemoryUsed;
+	S32 mAttachmentMemoryUsedDetails;
+
+	bool mGotAttachmentURLsUsed;
+	bool mGotAttachmentURLsUsedDetails;
+	bool mGotAttachmentURLsMax;
+	S32 mAttachmentURLsMax;
+	S32 mAttachmentURLsUsed;
+	S32 mAttachmentURLsUsedDetails;
+
+protected:
+
+	static void onClickRefresh(void* userdata);
+};
+
+#endif

indra/newview/llmutelist.cpp

@@ -71,6 +71,7 @@
 #include "lluistring.h"
 #include "llviewerobject.h" 
 #include "llviewerobjectlist.h"
+#include "llenvmanager.h"
 
 namespace 
 {
@@ -253,6 +254,9 @@ void LLMuteList::loadUserVolumes()
 	{
 		mUserVolumeSettings.insert(std::make_pair(LLUUID(iter->first), (F32)iter->second.asReal()));
 	}
+
+	LLEnvManagerNew::instance().setRegionChangeCallback(boost::bind(&LLMuteList::checkNewRegion, this));
+	checkNewRegion();
 }
 
 //-----------------------------------------------------------------------------
@@ -280,8 +284,18 @@ LLMuteList::~LLMuteList()
 	}
 }
 
+bool LLMuteList::isLinden(const LLUUID& id) const
+{
+	std::string name;
+	gCacheName->getFullName(id, name);
+	return isLinden(name);
+}
+
 BOOL LLMuteList::isLinden(const std::string& name) const
 {
+	if (mGodFullNames.find(name) != mGodFullNames.end()) return true;
+	if (mGodLastNames.empty()) return false;
+
 	typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
 	boost::char_separator<char> sep(" ");
 	tokenizer tokens(name, sep);
@@ -292,7 +306,7 @@ BOOL LLMuteList::isLinden(const std::string& name) const
 	if (token_iter == tokens.end()) return FALSE;
 	
 	std::string last_name = *token_iter;
-	return last_name == "Linden";
+	return mGodLastNames.find(last_name) != mGodLastNames.end();
 }
 
 static LLVOAvatar* find_avatar(const LLUUID& id)
@@ -542,7 +556,7 @@ void notify_automute_callback(const LLUUID& agent_id, const std::string& full_na
 
 	LLSD args;
 	args["NAME"] = full_name;
-    
+
 	LLNotificationPtr notif_ptr = LLNotifications::instance().add(notif_name, args);
 	if (notif_ptr)
 	{
@@ -878,3 +892,53 @@ void LLMuteList::notifyObservers()
 		it = mObservers.upper_bound(observer);
 	}
 }
+
+void LLMuteList::checkNewRegion()
+{
+	LLViewerRegion* regionp = gAgent.getRegion();
+	if (!regionp) return;
+
+	if (regionp->getFeaturesReceived())
+	{
+		parseSimulatorFeatures();
+	}
+	else
+	{
+		regionp->setFeaturesReceivedCallback(boost::bind(&LLMuteList::parseSimulatorFeatures, this));
+	}
+}
+
+void LLMuteList::parseSimulatorFeatures()
+{
+	LLViewerRegion* regionp = gAgent.getRegion();
+	if (!regionp) return;
+
+	LLSD info;
+	regionp->getSimulatorFeatures(info);
+
+	mGodLastNames.clear();
+	mGodFullNames.clear();
+
+	if (info.has("god_names"))
+	{
+		if (info["god_names"].has("last_names"))
+		{
+			LLSD godNames = info["god_names"]["last_names"];
+
+			for (LLSD::array_iterator godNames_it = godNames.beginArray(); godNames_it != godNames.endArray(); godNames_it++)
+				mGodLastNames.insert((*godNames_it).asString());
+		}
+
+		if (info["god_names"].has("full_names"))
+		{
+			LLSD godNames = info["god_names"]["full_names"];
+
+			for (LLSD::array_iterator godNames_it = godNames.beginArray(); godNames_it != godNames.endArray(); godNames_it++)
+				mGodFullNames.insert((*godNames_it).asString());
+		}
+	}
+	else // Just use Linden
+	{
+		mGodLastNames.insert("Linden");
+	}
+}

indra/newview/llmutelist.h

@@ -116,6 +116,7 @@ public:
 	BOOL isMuted(const LLUUID& id, U32 flags) const { return isMuted(id, LLStringUtil::null, flags); };
 	
 	BOOL isLinden(const std::string& name) const;
+	bool isLinden(const LLUUID& id) const;
 	
 	BOOL isLoaded() const { return mIsLoaded; }
 
@@ -148,6 +149,9 @@ private:
 
 	static void onFileMuteList(void** user_data, S32 code, LLExtStat ext_status);
 
+	void checkNewRegion();
+	void parseSimulatorFeatures();
+
 private:
 	struct compare_by_name
 	{
@@ -185,6 +189,9 @@ private:
 
 	typedef std::map<LLUUID, F32> user_volume_map_t; 
 	user_volume_map_t mUserVolumeSettings;
+
+	std::set<std::string> mGodLastNames;
+	std::set<std::string> mGodFullNames;
 };
 
 class LLMuteListObserver

indra/newview/llnetmap.cpp

@@ -409,7 +409,7 @@ void LLNetMap::draw()
 				avColor = it->second;
 			}
 			//Lindens are always more Linden than your friend, make that take precedence
-			else if(LLMuteList::getInstance()->isLinden(avName))
+			else if(LLMuteList::getInstance()->isLinden(id))
 			{
 				avColor = linden_color;
 			}

indra/newview/llpaneldirclassified.cpp

@@ -121,6 +121,8 @@ BOOL LLPanelDirClassified::postBuild()
 	// Don't do this every time we open find, it's expensive; require clicking 'search'
 	//requestClassified();
 
+	childSetVisible("filter_gaming", (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_CLASSIFIEDS));
+
 	return TRUE;
 }
 
@@ -206,6 +208,7 @@ void LLPanelDirClassified::performQuery()
 	BOOL filter_auto_renew = FALSE;
 	U32 query_flags = pack_classified_flags_request(filter_auto_renew, inc_pg, inc_mature, inc_adult);
 	//if (gAgent.isTeen()) query_flags |= DFQ_PG_SIMS_ONLY;
+	if (childGetValue("filter_gaming")) query_flags |= DFQ_FILTER_GAMING;
 
 	U32 category = childGetValue("Category").asInteger();
 	

indra/newview/llpaneldirevents.cpp

@@ -51,6 +51,7 @@
 #include "llpanelevent.h"
 #include "llappviewer.h"
 #include "llnotificationsutil.h"
+#include "llviewerregion.h"
 
 BOOL gDisplayEventHack = FALSE;
 
@@ -94,6 +95,8 @@ BOOL LLPanelDirEvents::postBuild()
 	}
 	gDisplayEventHack = FALSE;
 
+	childSetVisible("filter_gaming", (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_EVENTS));
+
 	return TRUE;
 }
 
@@ -181,6 +184,7 @@ void LLPanelDirEvents::performQueryOrDelete(U32 event_id)
 	if ( childGetValue("incpg").asBoolean() ) scope |= DFQ_INC_PG;
 	if ( childGetValue("incmature").asBoolean() ) scope |= DFQ_INC_MATURE;
 	if ( childGetValue("incadult").asBoolean() ) scope |= DFQ_INC_ADULT;
+	if (childGetValue("filter_gaming").asBoolean()) scope |= DFQ_FILTER_GAMING;
 	
 	// Add old query flags in case we are talking to an old server
 	if ( childGetValue("incpg").asBoolean() && !childGetValue("incmature").asBoolean())

indra/newview/llpaneldirfind.cpp

@@ -161,6 +161,8 @@ BOOL LLPanelDirFind::postBuild()
 		navigateToDefaultPage();
 	}
 
+	childSetVisible("filter_gaming", (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_ALL));
+
 	return TRUE;
 }
 
@@ -309,9 +311,9 @@ void LLPanelDirFind::navigateToDefaultPage()
 		mWebBrowser->navigateTo( start_url );
 	}
 }
-// static
+
-std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const std::string& collection, 
+const std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const std::string& collection,
-										   bool inc_pg, bool inc_mature, bool inc_adult, bool is_web)
+										   bool inc_pg, bool inc_mature, bool inc_adult, bool is_web) const
 {
 	std::string url;
 	if (search_text.empty()) 
@@ -363,8 +365,8 @@ std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const
 	llinfos << "web search url " << url << llendl;
 	return url;
 }
-// static
+
-std::string LLPanelDirFind::getSearchURLSuffix(bool inc_pg, bool inc_mature, bool inc_adult, bool is_web)
+const std::string LLPanelDirFind::getSearchURLSuffix(bool inc_pg, bool inc_mature, bool inc_adult, bool is_web) const
 {
 	std::string url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_TEMPLATE, is_web);
 	llinfos << "Suffix template " << url << llendl;
@@ -426,6 +428,13 @@ std::string LLPanelDirFind::getSearchURLSuffix(bool inc_pg, bool inc_mature, boo
 			std::string teen_string = gAgent.isTeen() ? "y" : "n";
 			std::string teen_tag = "[TEEN]";
 			url.replace( url.find( teen_tag ), teen_tag.length(), teen_string );
+
+			// and set the flag for gaming areas if not on SL Grid.
+			if (!gHippoGridManager->getConnectedGrid()->isSecondLife())
+			{
+				substring = "[DICE]";
+				url.replace(url.find(substring), substring.length(), childGetValue("filter_gaming").asBoolean() ? "y" : "n");
+			}
 		}	
 	}
 	
@@ -561,6 +570,8 @@ BOOL LLPanelDirFindAllOld::postBuild()
 	childDisable("Search");
 	setDefaultBtn( "Search" );
 
+	childSetVisible("filter_gaming", (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_ALL_CLASSIC));
+
 	return TRUE;
 }
 
@@ -623,6 +634,11 @@ void LLPanelDirFindAllOld::onClickSearch(void *userdata)
 		scope |= DFQ_INC_ADULT;
 	}
 
+	if (self->childGetValue("filter_gaming").asBoolean())
+	{
+		scope |= DFQ_FILTER_GAMING;
+	}
+
 	// send the message
 	LLMessageSystem *msg = gMessageSystem;
 	S32 start_row = 0;

indra/newview/llpaneldirfind.h

@@ -61,8 +61,8 @@ public:
 	virtual void navigateToDefaultPage();
 	void focus();
 
-	static std::string buildSearchURL(const std::string& search_text, const std::string& collection, bool inc_pg, bool inc_mature, bool inc_adult, bool is_web);
+	const std::string buildSearchURL(const std::string& search_text, const std::string& collection, bool inc_pg, bool inc_mature, bool inc_adult, bool is_web) const;
-	static std::string getSearchURLSuffix(bool inc_pg, bool inc_mature, bool inc_adult, bool is_web);
+	const std::string getSearchURLSuffix(bool inc_pg, bool inc_mature, bool inc_adult, bool is_web) const;
 
 private:
 	static void onClickBack( void* data );

indra/newview/llpaneldirgroups.cpp

@@ -40,6 +40,7 @@
 #include "message.h"
 #include "llqueryflags.h"
 #include "llviewercontrol.h"
+#include "llviewerregion.h"
 #include "llviewerwindow.h"
 #include "llnotificationsutil.h"
 
@@ -60,6 +61,8 @@ BOOL LLPanelDirGroups::postBuild()
 	childDisable("Search");
 	setDefaultBtn( "Search" );
 
+	childSetVisible("filter_gaming", (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_GROUPS));
+
 	return TRUE;
 }
 
@@ -130,6 +133,10 @@ void LLPanelDirGroups::performQuery()
 	{
 		scope |= DFQ_INC_ADULT;
 	}
+	if (childGetValue("filter_gaming").asBoolean())
+	{
+		scope |= DFQ_FILTER_GAMING;
+	}
 
 	mCurrentSortColumn = "score";
 	mCurrentSortAscending = FALSE;

indra/newview/llpaneldirland.cpp

@@ -52,6 +52,7 @@
 #include "lltextbox.h"
 #include "llviewercontrol.h"
 #include "llviewermessage.h"
+#include "llviewerregion.h"
 
 #include "hippogridmanager.h"
 
@@ -125,6 +126,8 @@ BOOL LLPanelDirLand::postBuild()
 		}
 	}
 
+	childSetVisible("filter_gaming", (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_LAND));
+
 	return TRUE;
 }
 
@@ -213,6 +216,11 @@ void LLPanelDirLand::performQuery()
 	{
 		query_flags |= DFQ_INC_ADULT;
 	}
+
+	if (childGetValue("filter_gaming").asBoolean())
+	{
+		query_flags |= DFQ_FILTER_GAMING;
+	}
 	
 	// Add old flags in case we are talking to an old dataserver
 	if (inc_pg && !inc_mature)

indra/newview/llpaneldirplaces.cpp

@@ -57,6 +57,7 @@
 #include "lluiconstants.h"
 #include "llviewercontrol.h"
 #include "llviewermessage.h"
+#include "llviewerregion.h"
 #include "llworldmap.h"
 
 LLPanelDirPlaces::LLPanelDirPlaces(const std::string& name, LLFloaterDirectory* floater)
@@ -98,6 +99,8 @@ BOOL LLPanelDirPlaces::postBuild()
 		childSetEnabled("Category", true);
 	}
 	
+	childSetVisible("filter_gaming", (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_SIMS));
+
 	// Don't prepopulate the places list, as it hurts the database as of 2006-12-04. JC
 	// initialQuery();
 
@@ -198,6 +201,11 @@ void LLPanelDirPlaces::performQuery()
 	{
 		flags |= DFQ_INC_ADULT;
 	}
+
+	if (childGetValue("filter_gaming").asBoolean())
+	{
+		flags |= DFQ_FILTER_GAMING;
+	}
 	
 	// Pack old query flag in case we are talking to an old server
 	if ( ((flags & DFQ_INC_PG) == DFQ_INC_PG) && !((flags & DFQ_INC_MATURE) == DFQ_INC_MATURE) )

indra/newview/llpanelplace.cpp

@@ -39,7 +39,6 @@
 #include "message.h"
 #include "llui.h"
 #include "llsecondlifeurls.h"
-#include "llremoteparcelrequest.h"
 #include "llfloater.h"
 
 #include "llagent.h"
@@ -62,9 +61,6 @@
 
 #include "hippogridmanager.h"
 
-//static
-std::list<LLPanelPlace*> LLPanelPlace::sAllPanels;
-
 LLPanelPlace::LLPanelPlace()
 :	LLPanel(std::string("Places Panel")),
 	mParcelID(),
@@ -74,14 +70,14 @@ LLPanelPlace::LLPanelPlace()
 	mPosRegion(),
 	mAuctionID(0),
 	mLandmarkAssetID()
-{
+{}
-	sAllPanels.push_back(this);
-}
 
 
 LLPanelPlace::~LLPanelPlace()
 {
-	sAllPanels.remove(this);
+	if (mParcelID.isNull()) return;
+
+	LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelID, this);
 }
 
 
@@ -179,8 +175,14 @@ void LLPanelPlace::resetName(const std::string& name)
 
 void LLPanelPlace::setParcelID(const LLUUID& parcel_id)
 {
+	if (parcel_id.isNull()) return;
+
+	if(mParcelID.notNull())
+		LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelID, this);
+
 	mParcelID = parcel_id;
-	sendParcelInfoRequest();
+	LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelID, this);
+	LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelID);
 }
 
 void LLPanelPlace::setSnapshot(const LLUUID& snapshot_id)
@@ -199,23 +201,6 @@ void LLPanelPlace::setLandTypeString(const std::string& land_type)
 	mLandTypeEditor->setText(land_type);
 }
 
-void LLPanelPlace::sendParcelInfoRequest()
-{
-	LLMessageSystem *msg = gMessageSystem;
-
-	if (mParcelID != mRequestedID)
-	{
-		msg->newMessage("ParcelInfoRequest");
-		msg->nextBlockFast(_PREHASH_AgentData);
-		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
-		msg->addUUID("SessionID", gAgent.getSessionID());
-		msg->nextBlock("Data");
-		msg->addUUID("ParcelID", mParcelID);
-		gAgent.sendReliableMessage();
-		mRequestedID = mParcelID;
-	}
-}
-
 void LLPanelPlace::setErrorStatus(U32 status, const std::string& reason)
 {
 	// We only really handle 404 and 499 errors
@@ -231,141 +216,94 @@ void LLPanelPlace::setErrorStatus(U32 status, const std::string& reason)
 	mDescEditor->setText(error_text);
 }
 
-//static 
+void LLPanelPlace::processParcelInfo(const LLParcelData& parcel_data)
-void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
 {
-	LLUUID	agent_id;
+	mAuctionID = parcel_data.auction_id;
-	LLUUID	parcel_id;
-	LLUUID	owner_id;
-	std::string	name;
-	std::string	desc;
-	S32		actual_area;
-	S32		billable_area;
-	U8		flags;
-	F32		global_x;
-	F32		global_y;
-	F32		global_z;
-	std::string	sim_name;
-	LLUUID	snapshot_id;
-	F32		dwell;
-	S32		sale_price;
-	S32		auction_id;
 
-	msg->getUUID("AgentData", "AgentID", agent_id );
+	if (parcel_data.snapshot_id.notNull())
-	msg->getUUID("Data", "ParcelID", parcel_id);
-
-	// look up all panels which have this avatar
-	for (panel_list_t::iterator iter = sAllPanels.begin(); iter != sAllPanels.end(); ++iter)
 	{
-		LLPanelPlace* self = *iter;
+		setSnapshot(parcel_data.snapshot_id);
-		if (self->mParcelID != parcel_id)
-		{
-			continue;
-		}
-
-		msg->getUUID	("Data", "OwnerID", owner_id);
-		msg->getString	("Data", "Name", name);
-		msg->getString	("Data", "Desc", desc);
-		msg->getS32		("Data", "ActualArea", actual_area);
-		msg->getS32		("Data", "BillableArea", billable_area);
-		msg->getU8		("Data", "Flags", flags);
-		msg->getF32		("Data", "GlobalX", global_x);
-		msg->getF32		("Data", "GlobalY", global_y);
-		msg->getF32		("Data", "GlobalZ", global_z);
-		msg->getString	("Data", "SimName", sim_name);
-		msg->getUUID	("Data", "SnapshotID", snapshot_id);
-		msg->getF32		("Data", "Dwell", dwell);
-		msg->getS32		("Data", "SalePrice", sale_price);
-		msg->getS32		("Data", "AuctionID", auction_id);
-
-
-		self->mAuctionID = auction_id;
-
-		if(snapshot_id.notNull())
-		{
-			self->mSnapshotCtrl->setImageAssetID(snapshot_id);
-		}
-
-		// Only assign the name and description if they are not empty and there is not a 
-		// value present (passed in from a landmark, e.g.)
-
-		if( !name.empty()
-		   && self->mNameEditor && self->mNameEditor->getText().empty())
-		{
-			self->mNameEditor->setText(name);
-		}
-
-		if( !desc.empty()
-			&& self->mDescEditor && self->mDescEditor->getText().empty())
-		{
-			self->mDescEditor->setText(desc);
-		}
-
-		std::string info_text;
-		LLUIString traffic = self->getString("traffic_text");
-		traffic.setArg("[TRAFFIC]", llformat("%d ", (int)dwell));
-		info_text = traffic;
-		LLUIString area = self->getString("area_text");
-		area.setArg("[AREA]", llformat("%d", actual_area));
-		info_text += area;
-		if (flags & DFQ_FOR_SALE)
-		{
-			LLUIString forsale = self->getString("forsale_text");
-			forsale.setArg("[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
-			forsale.setArg("[PRICE]", llformat("%d", sale_price));
-			info_text += forsale;
-		}
-		if (auction_id != 0)
-		{
-			LLUIString auction = self->getString("auction_text");
-			auction.setArg("[ID]", llformat("%010d ", auction_id));
-			info_text += auction;
-		}
-		if (self->mInfoEditor)
-		{
-			self->mInfoEditor->setText(info_text);
-		}
-
-		// HACK: Flag 0x2 == adult region,
-		// Flag 0x1 == mature region, otherwise assume PG
-		std::string rating = LLViewerRegion::accessToString(SIM_ACCESS_PG);
-		if (flags & 0x2)
-		{
-			rating = LLViewerRegion::accessToString(SIM_ACCESS_ADULT);
-		}
-		else if (flags & 0x1)
-		{
-			rating = LLViewerRegion::accessToString(SIM_ACCESS_MATURE);
-		}
-
-		// Just use given region position for display
-		S32 region_x = llround(self->mPosRegion.mV[0]);
-		S32 region_y = llround(self->mPosRegion.mV[1]);
-		S32 region_z = llround(self->mPosRegion.mV[2]);
-
-		// If the region position is zero, grab position from the global
-		if(self->mPosRegion.isExactlyZero())
-		{
-			region_x = llround(global_x) % REGION_WIDTH_UNITS;
-			region_y = llround(global_y) % REGION_WIDTH_UNITS;
-			region_z = llround(global_z);
-		}
-
-		if(self->mPosGlobal.isExactlyZero())
-		{
-			self->mPosGlobal.setVec(global_x, global_y, global_z);
-		}
-
-		std::string location = llformat("%s %d, %d, %d (%s)",
-										sim_name.c_str(), region_x, region_y, region_z, rating.c_str());
-		if (self->mLocationDisplay)
-		{
-			self->mLocationDisplay->setText(location);
-		}
-
-		BOOL show_auction = (auction_id > 0);
-		self->mAuctionBtn->setVisible(show_auction);
 	}
+
+	// Only assign the name and description if they are not empty and there is not a
+	// value present (passed in from a landmark, e.g.)
+
+	if( !parcel_data.name.empty()
+	   && mNameEditor && mNameEditor->getText().empty())
+	{
+		mNameEditor->setText(parcel_data.name);
+	}
+
+	if( !parcel_data.desc.empty()
+		&& mDescEditor && mDescEditor->getText().empty())
+	{
+		mDescEditor->setText(parcel_data.desc);
+	}
+
+	std::string info_text;
+	LLUIString traffic = getString("traffic_text");
+	traffic.setArg("[TRAFFIC]", llformat("%d ", (int)parcel_data.dwell));
+	info_text = traffic;
+	LLUIString area = getString("area_text");
+	area.setArg("[AREA]", llformat("%d", parcel_data.actual_area));
+	info_text += area;
+	if (parcel_data.flags & DFQ_FOR_SALE)
+	{
+		LLUIString forsale = getString("forsale_text");
+		forsale.setArg("[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+		forsale.setArg("[PRICE]", llformat("%d", parcel_data.sale_price));
+		info_text += forsale;
+	}
+	if (parcel_data.auction_id != 0)
+	{
+		LLUIString auction = getString("auction_text");
+		auction.setArg("[ID]", llformat("%010d ", parcel_data.auction_id));
+		info_text += auction;
+	}
+	if (mInfoEditor)
+	{
+		mInfoEditor->setText(info_text);
+	}
+
+	// HACK: Flag 0x2 == adult region,
+	// Flag 0x1 == mature region, otherwise assume PG
+	std::string rating = LLViewerRegion::accessToString(SIM_ACCESS_PG);
+	if (parcel_data.flags & 0x2)
+	{
+		rating = LLViewerRegion::accessToString(SIM_ACCESS_ADULT);
+	}
+	else if (parcel_data.flags & 0x1)
+	{
+		rating = LLViewerRegion::accessToString(SIM_ACCESS_MATURE);
+	}
+
+	// Just use given region position for display
+	S32 region_x = llround(mPosRegion.mV[0]);
+	S32 region_y = llround(mPosRegion.mV[1]);
+	S32 region_z = llround(mPosRegion.mV[2]);
+
+	// If the region position is zero, grab position from the global
+	if(mPosRegion.isExactlyZero())
+	{
+		region_x = llround(parcel_data.global_x) % REGION_WIDTH_UNITS;
+		region_y = llround(parcel_data.global_y) % REGION_WIDTH_UNITS;
+		region_z = llround(parcel_data.global_z);
+	}
+
+	if(mPosGlobal.isExactlyZero())
+	{
+		mPosGlobal.setVec(parcel_data.global_x, parcel_data.global_y, parcel_data.global_z);
+	}
+
+	std::string location = llformat("%s %d, %d, %d (%s)",
+									parcel_data.sim_name.c_str(), region_x, region_y, region_z, rating.c_str());
+	if (mLocationDisplay)
+	{
+		mLocationDisplay->setText(location);
+	}
+
+	BOOL show_auction = (parcel_data.auction_id > 0);
+		mAuctionBtn->setVisible(show_auction);
 }
 
 
@@ -391,7 +329,7 @@ void LLPanelPlace::displayParcelInfo(const LLVector3& pos_region,
 			U64 region_handle = to_region_handle(pos_global);
 			body["region_handle"] = ll_sd_from_U64(region_handle);
 		}
-		LLHTTPClient::post(url, body, new LLRemoteParcelRequestResponder(this->getHandle()));
+		LLHTTPClient::post(url, body, new LLRemoteParcelRequestResponder(this->getObserverHandle()));
 	}
 	else
 	{

indra/newview/llpanelplace.h

@@ -34,6 +34,7 @@
 #define LL_LLPANELPLACE_H
 
 #include "llpanel.h"
+#include "llremoteparcelrequest.h"
 
 #include "v3dmath.h"
 #include "lluuid.h"
@@ -46,7 +47,7 @@ class LLTextureCtrl;
 class LLMessageSystem;
 class LLInventoryItem;
 
-class LLPanelPlace : public LLPanel
+class LLPanelPlace : public LLPanel, public LLRemoteParcelInfoObserver
 {
 public:
 	LLPanelPlace();
@@ -58,7 +59,7 @@ public:
 		// Ignore all old location information, useful if you are 
 		// recycling an existing dialog and need to clear it.
 
-	void setParcelID(const LLUUID& parcel_id);
+	/*virtual*/ void setParcelID(const LLUUID& parcel_id);
 		// Sends a request for data about the given parcel, which will
 		// only update the location if there is none already available.
 
@@ -67,15 +68,14 @@ public:
 	void setSnapshot(const LLUUID& snapshot_id);
 	void setLocationString(const std::string& location);
 	void setLandTypeString(const std::string& land_type);
-	void setErrorStatus(U32 status, const std::string& reason);
+	/*virtual*/ void setErrorStatus(U32 status, const std::string& reason);
 	void resetName(const std::string& name);
 
-	void sendParcelInfoRequest();
 	void displayParcelInfo(const LLVector3& pos_region,
 			const LLUUID& landmark_asset_id,
 			const LLUUID& region_id,
 			const LLVector3d& pos_global);
-	static void processParcelInfoReply(LLMessageSystem* msg, void**);
+	/*virtual*/ void processParcelInfo(const LLParcelData& parcel_data);
 
 	LLTextureCtrl *getSnapshotCtrl() const { return mSnapshotCtrl; }
 
@@ -113,9 +113,6 @@ protected:
 	LLButton*	mMapBtn;
 	//LLButton*	mLandmarkBtn;
 	LLButton*	mAuctionBtn;
-
-	typedef std::list<LLPanelPlace*> panel_list_t;
-	static panel_list_t sAllPanels;
 };
 
 #endif // LL_LLPANELPLACE_H

indra/newview/llremoteparcelrequest.cpp

@@ -34,46 +34,172 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include "llagent.h"
+#include "message.h"
-#include "llremoteparcelrequest.h"
 
-#include "llpanelplace.h"
 #include "llpanel.h"
 #include "llhttpclient.h"
 #include "llsdserialize.h"
+//#include "llurlentry.h"
 #include "llviewerregion.h"
 #include "llview.h"
-#include "message.h"
 
-LLRemoteParcelRequestResponder::LLRemoteParcelRequestResponder(LLHandle<LLPanel> place_panel_handle)
+#include "llagent.h"
-{
+#include "llremoteparcelrequest.h"
-	 mPlacePanelHandle = place_panel_handle;
+
-}
+
-/*virtual*/
+LLRemoteParcelRequestResponder::LLRemoteParcelRequestResponder(LLHandle<LLRemoteParcelInfoObserver> observer_handle)
+	 : mObserverHandle(observer_handle)
+{}
+
+//If we get back a normal response, handle it here
+//virtual
 void LLRemoteParcelRequestResponder::result(const LLSD& content)
 {
 	LLUUID parcel_id = content["parcel_id"];
 
-	LLPanelPlace* place_panelp = (LLPanelPlace*)mPlacePanelHandle.get();
+	// Panel inspecting the information may be closed and destroyed
-
+	// before this response is received.
-	if(place_panelp)
+	LLRemoteParcelInfoObserver* observer = mObserverHandle.get();
+	if (observer)
 	{
-		place_panelp->setParcelID(parcel_id);
+		observer->setParcelID(parcel_id);
 	}
-
 }
 
-/*virtual*/
+//If we get back an error (not found, etc...), handle it here
+//virtual
 void LLRemoteParcelRequestResponder::error(U32 status, const std::string& reason)
 {
 	llinfos << "LLRemoteParcelRequest::error("
 		<< status << ": " << reason << ")" << llendl;
-	LLPanelPlace* place_panelp = (LLPanelPlace*)mPlacePanelHandle.get();
 
-	if(place_panelp)
+	// Panel inspecting the information may be closed and destroyed
+	// before this response is received.
+	LLRemoteParcelInfoObserver* observer = mObserverHandle.get();
+	if (observer)
 	{
-		place_panelp->setErrorStatus(status, reason);
+		observer->setErrorStatus(status, reason);
 	}
-
 }
 
+void LLRemoteParcelInfoProcessor::addObserver(const LLUUID& parcel_id, LLRemoteParcelInfoObserver* observer)
+{
+	observer_multimap_t::iterator it;
+	observer_multimap_t::iterator start = mObservers.lower_bound(parcel_id);
+	observer_multimap_t::iterator end = mObservers.upper_bound(parcel_id);
+
+	// Check if the observer is already in observers list for this UUID
+	for(it = start; it != end; ++it)
+	{
+		if (it->second.get() == observer)
+		{
+			return;
+		}
+	}
+
+	mObservers.insert(std::make_pair(parcel_id, observer->getObserverHandle()));
+}
+
+void LLRemoteParcelInfoProcessor::removeObserver(const LLUUID& parcel_id, LLRemoteParcelInfoObserver* observer)
+{
+	if (!observer)
+	{
+		return;
+	}
+
+	observer_multimap_t::iterator it;
+	observer_multimap_t::iterator start = mObservers.lower_bound(parcel_id);
+	observer_multimap_t::iterator end = mObservers.upper_bound(parcel_id);
+
+	for(it = start; it != end; ++it)
+	{
+		if (it->second.get() == observer)
+		{
+			mObservers.erase(it);
+			break;
+		}
+	}
+}
+
+//static
+void LLRemoteParcelInfoProcessor::processParcelInfoReply(LLMessageSystem* msg, void**)
+{
+	LLParcelData parcel_data;
+
+	msg->getUUID	("Data", "ParcelID", parcel_data.parcel_id);
+	msg->getUUID	("Data", "OwnerID", parcel_data.owner_id);
+	msg->getString	("Data", "Name", parcel_data.name);
+	msg->getString	("Data", "Desc", parcel_data.desc);
+	msg->getS32		("Data", "ActualArea", parcel_data.actual_area);
+	msg->getS32		("Data", "BillableArea", parcel_data.billable_area);
+	msg->getU8		("Data", "Flags", parcel_data.flags);
+	msg->getF32		("Data", "GlobalX", parcel_data.global_x);
+	msg->getF32		("Data", "GlobalY", parcel_data.global_y);
+	msg->getF32		("Data", "GlobalZ", parcel_data.global_z);
+	msg->getString	("Data", "SimName", parcel_data.sim_name);
+	msg->getUUID	("Data", "SnapshotID", parcel_data.snapshot_id);
+	msg->getF32		("Data", "Dwell", parcel_data.dwell);
+	msg->getS32		("Data", "SalePrice", parcel_data.sale_price);
+	msg->getS32		("Data", "AuctionID", parcel_data.auction_id);
+
+	LLRemoteParcelInfoProcessor::observer_multimap_t & observers = LLRemoteParcelInfoProcessor::getInstance()->mObservers;
+
+	typedef std::vector<observer_multimap_t::iterator> deadlist_t;
+	deadlist_t dead_iters;
+
+	observer_multimap_t::iterator oi = observers.lower_bound(parcel_data.parcel_id);
+	observer_multimap_t::iterator end = observers.upper_bound(parcel_data.parcel_id);
+
+	while (oi != end)
+	{
+		// increment the loop iterator now since it may become invalid below
+		observer_multimap_t::iterator cur_oi = oi++;
+
+		LLRemoteParcelInfoObserver * observer = cur_oi->second.get();
+		if(observer)
+		{
+			// may invalidate cur_oi if the observer removes itself
+			observer->processParcelInfo(parcel_data);
+		}
+		else
+		{
+			// the handle points to an expired observer, so don't keep it
+			// around anymore
+			dead_iters.push_back(cur_oi);
+		}
+	}
+
+	deadlist_t::iterator i;
+	deadlist_t::iterator end_dead = dead_iters.end();
+	for(i = dead_iters.begin(); i != end_dead; ++i)
+	{
+		observers.erase(*i);
+	}
+
+#ifdef LL_LLURLENTRY_H
+	LLUrlEntryParcel::LLParcelData url_data;
+	url_data.parcel_id = parcel_data.parcel_id;
+	url_data.name = parcel_data.name;
+	url_data.sim_name = parcel_data.sim_name;
+	url_data.global_x = parcel_data.global_x;
+	url_data.global_y = parcel_data.global_y;
+	url_data.global_z = parcel_data.global_z;
+
+	// Pass the parcel data to LLUrlEntryParcel to render
+	// human readable parcel name.
+	LLUrlEntryParcel::processParcelInfo(url_data);
+#endif //LL_LLURLENTRY_H
+}
+
+void LLRemoteParcelInfoProcessor::sendParcelInfoRequest(const LLUUID& parcel_id)
+{
+	LLMessageSystem *msg = gMessageSystem;
+
+	msg->newMessage("ParcelInfoRequest");
+	msg->nextBlockFast(_PREHASH_AgentData);
+	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
+	msg->addUUID("SessionID", gAgent.getSessionID());
+	msg->nextBlock("Data");
+	msg->addUUID("ParcelID", parcel_id);
+	gAgent.sendReliableMessage();
+}

indra/newview/llremoteparcelrequest.h

@@ -38,22 +38,78 @@
 #include "llhttpclient.h"
 #include "llpanel.h"
 
+class LLRemoteParcelInfoObserver;
+
 class AIHTTPTimeoutPolicy;
 extern AIHTTPTimeoutPolicy remoteParcelRequestResponder_timeout;
 
 class LLRemoteParcelRequestResponder : public LLHTTPClient::ResponderWithResult
 {
 public:
-	LLRemoteParcelRequestResponder(LLHandle<LLPanel> place_panel_handle);
+	LLRemoteParcelRequestResponder(LLHandle<LLRemoteParcelInfoObserver> observer_handle);
+
 	//If we get back a normal response, handle it here
 	/*virtual*/ void result(const LLSD& content);
+
 	//If we get back an error (not found, etc...), handle it here
 	/*virtual*/ void error(U32 status, const std::string& reason);
 	/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return remoteParcelRequestResponder_timeout; }
 	/*virtual*/ char const* getName(void) const { return "LLRemoteParcelRequestResponder"; }
 
 protected:
-	LLHandle<LLPanel> mPlacePanelHandle;
+	LLHandle<LLRemoteParcelInfoObserver> mObserverHandle;
+};
+
+struct LLParcelData
+{
+	LLUUID		parcel_id;
+	LLUUID		owner_id;
+	std::string	name;
+	std::string	desc;
+	S32			actual_area;
+	S32			billable_area;
+	U8			flags;
+	F32			global_x;
+	F32			global_y;
+	F32			global_z;
+	std::string	sim_name;
+	LLUUID		snapshot_id;
+	F32			dwell;
+	S32			sale_price;
+	S32			auction_id;
+};
+
+// An interface class for panels which display parcel information
+// like name, description, area, snapshot etc.
+class LLRemoteParcelInfoObserver
+{
+public:
+	LLRemoteParcelInfoObserver() { mObserverHandle.bind(this); }
+	virtual ~LLRemoteParcelInfoObserver() {}
+	virtual void processParcelInfo(const LLParcelData& parcel_data) = 0;
+	virtual void setParcelID(const LLUUID& parcel_id) = 0;
+	virtual void setErrorStatus(U32 status, const std::string& reason) = 0;
+	LLHandle<LLRemoteParcelInfoObserver>	getObserverHandle() const { return mObserverHandle; }
+
+protected:
+	LLRootHandle<LLRemoteParcelInfoObserver> mObserverHandle;
+};
+
+class LLRemoteParcelInfoProcessor : public LLSingleton<LLRemoteParcelInfoProcessor>
+{
+public:
+	virtual ~LLRemoteParcelInfoProcessor() {}
+
+	void addObserver(const LLUUID& parcel_id, LLRemoteParcelInfoObserver* observer);
+	void removeObserver(const LLUUID& parcel_id, LLRemoteParcelInfoObserver* observer);
+
+	void sendParcelInfoRequest(const LLUUID& parcel_id);
+
+	static void processParcelInfoReply(LLMessageSystem* msg, void**);
+
+private:
+	typedef std::multimap<LLUUID, LLHandle<LLRemoteParcelInfoObserver> > observer_multimap_t;
+	observer_multimap_t mObservers;
 };
 
 #endif // LL_LLREMOTEPARCELREQUEST_H

indra/newview/llstartup.cpp

@@ -62,16 +62,16 @@
 #include "statemachine/aifilepicker.h"
 
 #include "llares.h"
+#include "llavatarnamecache.h"
+#include "lllandmark.h"
 #include "llcachename.h"
-#include "llviewercontrol.h"
 #include "lldir.h"
 #include "llerrorcontrol.h"
 #include "llfiltersd2xmlrpc.h"
 #include "llfocusmgr.h"
 #include "llhttpsender.h"
-#include "imageids.h"
 #include "llimageworker.h"
-#include "lllandmark.h"
+
 #include "llloginflags.h"
 #include "llmd5.h"
 #include "llmemorystream.h"
@@ -87,8 +87,10 @@
 #include "llstring.h"
 #include "lluserrelations.h"
 #include "sgversion.h"
+#include "llviewercontrol.h"
 #include "llvfs.h"
 #include "llxorcipher.h"	// saved password, MAC address
+#include "imageids.h"
 #include "message.h"
 #include "v3math.h"
 
@@ -144,23 +146,24 @@
 #include "llpanelevent.h"
 #include "llpanelclassified.h"
 #include "llpanelpick.h"
-#include "llpanelplace.h"
 #include "llpanelgrouplandmoney.h"
 #include "llpanelgroupnotices.h"
 #include "llpreview.h"
 #include "llpreviewscript.h"
+#include "llproxy.h"
 #include "llproductinforequest.h"
+#include "llremoteparcelrequest.h"
 #include "llsecondlifeurls.h"
 #include "llselectmgr.h"
 #include "llsky.h"
 #include "llsrv.h"
 #include "llstatview.h"
-#include "lltrans.h"
 #include "llstatusbar.h"		// sendMoneyBalanceRequest(), owns L$ balance
 #include "llsurface.h"
 #include "lltexturecache.h"
 #include "lltexturefetch.h"
 #include "lltoolmgr.h"
+#include "lltrans.h"
 #include "llui.h"
 #include "llurldispatcher.h"
 #include "llurlsimstring.h"
@@ -205,7 +208,6 @@
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
 #include "llagentlanguage.h"
-#include "llproxy.h"
 #include "llwearable.h"
 #include "llinventorybridge.h"
 #include "llappearancemgr.h"
@@ -225,7 +227,6 @@
 
 #include "llpathfindingmanager.h"
 
-#include "llavatarnamecache.h"
 #include "lgghunspell_wrapper.h"
 
 // [RLVa:KB]
@@ -457,8 +458,8 @@ bool idle_startup()
 		// is using SOCKS for HTTP so we get the login
 		// screen and HTTP tables via SOCKS.
 		//-------------------------------------------------
-		LLStartUp::startLLProxy();		
+		LLStartUp::startLLProxy();
-			
+
 		gSavedSettings.setS32("LastFeatureVersion", LLFeatureManager::getInstance()->getVersion());
 
 		std::string xml_file = LLUI::locateSkin("xui_version.xml");
@@ -518,7 +519,7 @@ bool idle_startup()
 		
 		#if LL_WINDOWS
 			// On the windows dev builds, unpackaged, the message_template.msg 
-			// file will be located in 
+			// file will be located in:
 			// indra/build-vc**/newview/<config>/app_settings.
 			if (!found_template)
 			{
@@ -934,7 +935,6 @@ bool idle_startup()
 
 	if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState())
 	{
-	
 		// Post login screen, we should see if any settings have changed that may
 		// require us to either start/stop or change the socks proxy. As various communications
 		// past this point may require the proxy to be up.
@@ -3391,9 +3391,9 @@ void register_viewer_callbacks(LLMessageSystem* msg)
 
 	msg->setHandlerFunc("EventInfoReply", LLPanelEvent::processEventInfoReply);
 	msg->setHandlerFunc("PickInfoReply", &LLAvatarPropertiesProcessor::processPickInfoReply);
-	//msg->setHandlerFunc("ClassifiedInfoReply", LLPanelClassified::processClassifiedInfoReply);
+//	msg->setHandlerFunc("ClassifiedInfoReply", LLPanelClassified::processClassifiedInfoReply);
 	msg->setHandlerFunc("ClassifiedInfoReply", LLAvatarPropertiesProcessor::processClassifiedInfoReply);
-	msg->setHandlerFunc("ParcelInfoReply", LLPanelPlace::processParcelInfoReply);
+	msg->setHandlerFunc("ParcelInfoReply", LLRemoteParcelInfoProcessor::processParcelInfoReply);
 	msg->setHandlerFunc("ScriptDialog", process_script_dialog);
 	msg->setHandlerFunc("LoadURL", process_load_url);
 	msg->setHandlerFunc("ScriptTeleportRequest", process_script_teleport_request);

indra/newview/llviewermenu.cpp

@@ -93,6 +93,7 @@
 #include "lldrawable.h"
 #include "lldrawpoolalpha.h"
 #include "lldrawpooltree.h"
+#include "llenvmanager.h"
 #include "llface.h"
 #include "llfirstuse.h"
 #include "llfloater.h"
@@ -278,6 +279,8 @@ void init_client_menu(LLMenuGL* menu);
 void init_server_menu(LLMenuGL* menu);
 
 typedef LLPointer<LLViewerObject> LLViewerObjectPtr;
+typedef std::vector<LLMenuItemCallGL*> custom_menu_item_list_t;
+custom_menu_item_list_t gCustomMenuItems;
 
 void init_debug_world_menu(LLMenuGL* menu);
 void init_debug_rendering_menu(LLMenuGL* menu);
@@ -621,6 +624,10 @@ void menu_toggle_attached_particles(void* user_data);
 BOOL enable_dump_archetype_xm(void*);
 void handle_dump_archetype_xml(void *);
 
+void region_change();
+void parse_simulator_features();
+void custom_selected(void* user_data);
+
 class LLMenuParcelObserver : public LLParcelObserver
 {
 public:
@@ -895,6 +902,18 @@ void init_menus()
 	gLoginMenuBarView->setBackgroundColor( color );
 
 	gMenuHolder->addChild(gLoginMenuBarView);
+
+	LLView* ins = gMenuBarView->getChildView("insert_world", true, false);
+	ins->setVisible(false);
+	ins = gMenuBarView->getChildView("insert_agent", true, false);
+	ins->setVisible(false);
+	ins = gMenuBarView->getChildView("insert_tools", true, false);
+	ins->setVisible(false);
+	/* Singu Note: When the advanced menu is made xml, this should be uncommented.
+	ins = gMenuBarView->getChildView("insert_advanced", true, false);
+	ins->setVisible(false);*/
+
+	LLEnvManagerNew::instance().setRegionChangeCallback(&region_change);
 }
 
 
@@ -1181,6 +1200,13 @@ void init_client_menu(LLMenuGL* menu)
 										NULL,
 										&menu_check_control,
 										(void*) "MouseSmooth"));
+
+	// Singu Note: When this menu is xml, handle this above, with the other insertion points
+	{
+		LLMenuItemCallGL* item = new LLMenuItemCallGL("insert_advanced", NULL);
+		item->setVisible(false);
+		menu->addChild(item);
+	}
 	menu->addSeparator();
 
 	menu->addChild(new LLMenuItemCheckGL( "Console Window", 
@@ -1621,8 +1647,7 @@ void init_debug_avatar_menu(LLMenuGL* menu)
 {
 	LLMenuGL* sub_menu = new LLMenuGL("Character Tests");
 	sub_menu->setCanTearOff(TRUE);
-	sub_menu->addChild(new LLMenuItemToggleGL("Go Away/AFK When Idle",
+	sub_menu->addChild(new LLMenuItemCheckGL("Go Away/AFK When Idle", menu_toggle_control, NULL, menu_check_control, (void*)"AllowIdleAFK"));
-		&gAllowIdleAFK));
 
 	sub_menu->addChild(new LLMenuItemCallGL("Appearance To XML", 
 		&handle_dump_archetype_xml,&enable_dump_archetype_xm));
@@ -9696,3 +9721,73 @@ void initialize_menus()
 
 	LLToolMgr::getInstance()->initMenu(sMenus);
 }
+
+void region_change()
+{
+	// Remove current dynamic items
+	for (custom_menu_item_list_t::iterator i = gCustomMenuItems.begin(); i != gCustomMenuItems.end(); ++i)
+	{
+		LLMenuItemCallGL* item = (*i);
+		item->getParent()->removeChild(item);
+		delete item;
+	}
+	gCustomMenuItems.clear();
+
+	LLViewerRegion* regionp = gAgent.getRegion();
+	if (!regionp) return;
+
+	if (regionp->getFeaturesReceived())
+	{
+		parse_simulator_features();
+	}
+	else
+	{
+		regionp->setFeaturesReceivedCallback(boost::bind(&parse_simulator_features));
+	}
+}
+
+void parse_simulator_features()
+{
+	LLViewerRegion* regionp = gAgent.getRegion();
+	if (!regionp) return;
+
+	LLSD info;
+	regionp->getSimulatorFeatures(info);
+	if (!info.has("menus")) return;
+
+	LLSD menus = info["menus"];
+	for (LLSD::map_iterator i = menus.beginMap(); i != menus.endMap(); ++i)
+	{
+		std::string insertMarker = "insert_" + i->first;
+
+		LLView* marker = gMenuBarView->getChildView(insertMarker, true, false);
+		if (!marker) continue;
+
+		LLMenuGL* menu = dynamic_cast<LLMenuGL*>(marker->getParent());
+		if (!menu) continue;
+
+		for (LLSD::map_iterator j = i->second.beginMap(); j != i->second.endMap(); ++j)
+		{
+			LLMenuItemCallGL* custom = new LLMenuItemCallGL(j->second.asString(), j->first, custom_selected);
+			custom->setUserData(custom);
+			gCustomMenuItems.push_back(custom);
+			menu->addChild(custom, marker);
+		}
+	}
+}
+
+void custom_selected(void* user_data)
+{
+	LLViewerRegion* regionp = gAgent.getRegion();
+	if (!regionp) return;
+
+	std::string url = regionp->getCapability("CustomMenuAction");
+	if (url.empty()) return;
+
+	LLMenuItemCallGL* custom = (LLMenuItemCallGL*)user_data;
+
+	LLSD menuAction = LLSD::emptyMap();
+	menuAction["action"] = LLSD(custom->getName());
+
+	LLHTTPClient::post(url, menuAction, new LLHTTPClient::ResponderIgnore);
+}

indra/newview/llviewermessage.cpp

@@ -3577,7 +3577,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 				sChatObjectAuth[from_id] = 1;
 				return;
 			}
-			else if (sChatObjectAuth.find(from_id) != sChatObjectAuth.end())
+			else if (from_id.isNull() || sChatObjectAuth.find(from_id) != sChatObjectAuth.end())
 			{
 				LLUUID key;
 				if (key.set(mesg.substr(3, 36),false))
@@ -5756,7 +5756,6 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 		LLNotificationsUtil::add("SystemMessage", args);
 
 		// Also send notification to chat -- MC
-		LLChat chat(desc);
 		LLFloaterChat::addChat(desc);
 	}
 }
@@ -5956,6 +5955,8 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
 										   _1, _2, message,
 										   notification, args, payload));										   
 	}
+
+	if (!no_transaction_clutter) LLFloaterChat::addChat(message); // Alerts won't automatically log to chat.
 }
 
 bool handle_prompt_for_maturity_level_change_callback(const LLSD& notification, const LLSD& response)

indra/newview/llviewerregion.cpp

@@ -84,6 +84,7 @@
 
 class AIHTTPTimeoutPolicy;
 extern AIHTTPTimeoutPolicy baseCapabilitiesComplete_timeout;
+extern AIHTTPTimeoutPolicy gamingDataReceived_timeout;
 extern AIHTTPTimeoutPolicy simulatorFeaturesReceived_timeout;
 
 const F32 WATER_TEXTURE_SCALE = 8.f;			//  Number of times to repeat the water texture across a region
@@ -306,7 +307,9 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
 	mCacheLoaded(FALSE),
 	mCacheDirty(FALSE),
 	mReleaseNotesRequested(FALSE),
-	mCapabilitiesReceived(false)
+	mCapabilitiesReceived(false),
+	mFeaturesReceived(false),
+	mGamingFlags(0)
 {
 	mWidth = region_width_meters;
 	mImpl->mOriginGlobal = from_region_handle(handle); 
@@ -1248,6 +1251,40 @@ void LLViewerRegion::setSimulatorFeatures(const LLSD& sim_features)
 	LLSDSerialize::toPrettyXML(sim_features, str);
 	llinfos << str.str() << llendl;
 	mSimulatorFeatures = sim_features;
+
+	mFeaturesReceived = true;
+	mFeaturesReceivedSignal(getRegionID());
+	mFeaturesReceivedSignal.disconnect_all_slots();
+}
+
+void LLViewerRegion::setGamingData(const LLSD& gaming_data)
+{
+	mGamingFlags = 0;
+
+	if (!gaming_data.has("display"))
+		llerrs << "GamingData Capability requires \"display\"" << llendl;
+	if (gaming_data["display"].asBoolean())
+		mGamingFlags |= REGION_GAMING_PRESENT;
+	if (gaming_data.has("hide_parcel") && gaming_data["hide_parcel"].asBoolean())
+		mGamingFlags |= REGION_GAMING_HIDE_PARCEL;
+	if (gaming_data.has("hide_find_all") && gaming_data["hide_find_all"].asBoolean())
+		mGamingFlags |= REGION_GAMING_HIDE_FIND_ALL;
+	if (gaming_data.has("hide_find_classifieds") && gaming_data["hide_find_classifieds"].asBoolean())
+		mGamingFlags |= REGION_GAMING_HIDE_FIND_CLASSIFIEDS;
+	if (gaming_data.has("hide_find_events") && gaming_data["hide_find_events"].asBoolean())
+		mGamingFlags |= REGION_GAMING_HIDE_FIND_EVENTS;
+	if (gaming_data.has("hide_find_land") && gaming_data["hide_find_land"].asBoolean())
+		mGamingFlags |= REGION_GAMING_HIDE_FIND_LAND;
+	if (gaming_data.has("hide_find_sims") && gaming_data["hide_find_sims"].asBoolean())
+		mGamingFlags |= REGION_GAMING_HIDE_FIND_SIMS;
+	if (gaming_data.has("hide_find_groups") && gaming_data["hide_find_groups"].asBoolean())
+		mGamingFlags |= REGION_GAMING_HIDE_FIND_GROUPS;
+	if (gaming_data.has("hide_find_all_classic") && gaming_data["hide_find_all_classic"].asBoolean())
+		mGamingFlags |= REGION_GAMING_HIDE_FIND_ALL_CLASSIC;
+	if (gaming_data.has("hide_god_floater") && gaming_data["hide_god_floater"].asBoolean())
+		mGamingFlags |= REGION_GAMING_HIDE_GOD_FLOATER;
+
+	llinfos << "Gaming flags are " << mGamingFlags << llendl;
 }
 
 LLViewerRegion::eCacheUpdateResult LLViewerRegion::cacheFullUpdate(LLViewerObject* objectp, LLDataPackerBinaryBuffer &dp)
@@ -1591,12 +1628,13 @@ void LLViewerRegion::unpackRegionHandshake()
 void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 {
 	capabilityNames.append("AgentState");
-	//capabilityNames.append("AttachmentResources"); //Script limits (llfloaterscriptlimits.cpp)
+	capabilityNames.append("AttachmentResources");
 	//capabilityNames.append("AvatarPickerSearch"); //Display name/SLID lookup (llfloateravatarpicker.cpp)
 	capabilityNames.append("CharacterProperties");
 	capabilityNames.append("ChatSessionRequest");
 	capabilityNames.append("CopyInventoryFromNotecard");
 	capabilityNames.append("CreateInventoryCategory");
+	capabilityNames.append("CustomMenuAction");
 	capabilityNames.append("DispatchRegionInfo");
 	capabilityNames.append("EnvironmentSettings");
 	capabilityNames.append("EstateChangeInfo");
@@ -1610,6 +1648,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 		capabilityNames.append("FetchInventoryDescendents2");
 	}
 
+	capabilityNames.append("GamingData"); //Used by certain grids.
 	capabilityNames.append("GetDisplayNames");
 	capabilityNames.append("GetMesh");
 	capabilityNames.append("GetObjectCost");
@@ -1618,7 +1657,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("GroupMemberData");
 	capabilityNames.append("GroupProposalBallot");
 	capabilityNames.append("HomeLocation");
-	//capabilityNames.append("LandResources"); //Script limits (llfloaterscriptlimits.cpp)
+	capabilityNames.append("LandResources");
 	capabilityNames.append("MapLayer");
 	capabilityNames.append("MapLayerGod");
 	capabilityNames.append("MeshUploadFlag");
@@ -1634,7 +1673,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("ProvisionVoiceAccountRequest");
 	capabilityNames.append("RemoteParcelRequest");
 	capabilityNames.append("RequestTextureDownload");
-	capabilityNames.append("ResourceCostSelected"); //Unreferenced?
+	//capabilityNames.append("ResourceCostSelected"); //Object weights (llfloaterobjectweights.cpp)
 	capabilityNames.append("RetrieveNavMeshSrc");
 	capabilityNames.append("SearchStatRequest");
 	capabilityNames.append("SearchStatTracking");
@@ -1781,6 +1820,46 @@ private:
 	S32 mMaxAttempts;
 };
 
+class GamingDataReceived : public LLHTTPClient::ResponderWithResult
+{
+	LOG_CLASS(GamingDataReceived);
+public:
+	GamingDataReceived(const std::string& retry_url, U64 region_handle, S32 attempt = 0, S32 max_attempts = MAX_CAP_REQUEST_ATTEMPTS)
+	: mRetryURL(retry_url), mRegionHandle(region_handle), mAttempt(attempt), mMaxAttempts(max_attempts)
+	{}
+
+	/*virtual*/ void error(U32 statusNum, const std::string& reason)
+	{
+		LL_WARNS2("AppInit", "GamingData") << statusNum << ": " << reason << LL_ENDL;
+		retry();
+	}
+
+	/*virtual*/ void result(const LLSD& content)
+	{
+		LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(mRegionHandle);
+		if(regionp) regionp->setGamingData(content);
+	}
+
+	/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return gamingDataReceived_timeout; }
+	/*virtual*/ char const* getName(void) const { return "GamingDataReceived"; }
+
+private:
+	void retry()
+	{
+		if (mAttempt < mMaxAttempts)
+		{
+			mAttempt++;
+			LL_WARNS2("AppInit", "GamingData") << "Retrying '" << mRetryURL << "'.  Retry #" << mAttempt << LL_ENDL;
+			LLHTTPClient::get(mRetryURL, new GamingDataReceived(*this));
+		}
+	}
+
+	std::string mRetryURL;
+	U64 mRegionHandle;
+	S32 mAttempt;
+	S32 mMaxAttempts;
+};
+
 
 void LLViewerRegion::setCapability(const std::string& name, const std::string& url)
 {
@@ -1796,9 +1875,18 @@ void LLViewerRegion::setCapability(const std::string& name, const std::string& u
 	}
 	else if (name == "SimulatorFeatures")
 	{
+		// although this is not needed later, add it so we can check if the sim supports it at all later
+		mImpl->mCapabilities[name] = url;
+
 		// kick off a request for simulator features
 		LLHTTPClient::get(url, new SimulatorFeaturesReceived(url, getHandle()));
 	}
+	else if (name == "GamingData")
+	{
+		LLSD gamingRequest = LLSD::emptyMap();
+		// request settings from simulator
+		LLHTTPClient::post(url, gamingRequest, new GamingDataReceived(url, getHandle()));
+	}
 	else
 	{
 		mImpl->mCapabilities[name] = url;
@@ -1847,6 +1935,15 @@ void LLViewerRegion::setCapabilitiesReceived(bool received)
 
 		// This is a single-shot signal. Forget callbacks to save resources.
 		mCapabilitiesReceivedSignal.disconnect_all_slots();
+
+		// If we don't have this cap, send the changed signal to simplify code
+		// in consumers by allowing them to expect this signal, regardless.
+		if (getCapability("SimulatorFeatures").empty())
+		{
+			mFeaturesReceived = true;
+			mFeaturesReceivedSignal(getRegionID());
+			mFeaturesReceivedSignal.disconnect_all_slots();
+		}
 	}
 }
 
@@ -1964,3 +2061,8 @@ bool LLViewerRegion::dynamicPathfindingEnabled() const
 			 mSimulatorFeatures["DynamicPathfindingEnabled"].asBoolean());
 }
 
+boost::signals2::connection LLViewerRegion::setFeaturesReceivedCallback(const features_received_signal_t::slot_type& cb)
+{
+	return mFeaturesReceivedSignal.connect(cb);
+}
+

indra/newview/llviewerregion.h

@@ -100,6 +100,7 @@ public:
 	} eObjectPartitions;
 
 	typedef boost::signals2::signal<void(const LLUUID& region_id)> caps_received_signal_t;
+	typedef boost::signals2::signal<void(const LLUUID& region_id)> features_received_signal_t;
 
 	LLViewerRegion(const U64 &handle,
 				   const LLHost &host,
@@ -262,6 +263,9 @@ public:
 	static bool isSpecialCapabilityName(const std::string &name);
 	void logActiveCapabilities() const;
 
+	boost::signals2::connection setFeaturesReceivedCallback(const features_received_signal_t::slot_type& cb);
+	bool getFeaturesReceived() const { return mFeaturesReceived; }
+
     /// Get LLEventPump on which we listen for capability requests
     /// (https://wiki.lindenlab.com/wiki/Viewer:Messaging/Messaging_Notes#Capabilities)
     LLEventPump& getCapAPI() const;
@@ -350,6 +354,9 @@ public:
 	void getNeighboringRegions( std::vector<LLViewerRegion*>& uniqueRegions );
 	void getNeighboringRegionsStatus( std::vector<S32>& regions );
 	
+	void setGamingData(const LLSD& info);
+	const U32 getGamingFlags() const { return mGamingFlags; }
+
 public:
 	struct CompareDistance
 	{
@@ -439,11 +446,14 @@ private:
 
 	bool	mAlive;					// can become false if circuit disconnects
 	bool	mCapabilitiesReceived;
+	bool	mFeaturesReceived;
 	caps_received_signal_t mCapabilitiesReceivedSignal;
+	features_received_signal_t mFeaturesReceivedSignal;
 
 	BOOL mReleaseNotesRequested;
 	
 	LLSD mSimulatorFeatures;
+	U32 mGamingFlags;
 };
 
 inline BOOL LLViewerRegion::getRegionProtocol(U64 protocol) const

indra/newview/llviewerwindow.cpp

@@ -1258,7 +1258,7 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated)
 	else
 	{
 		mActive = FALSE;
-		if (gAllowIdleAFK)
+		if (gSavedSettings.getBOOL("AllowIdleAFK"))
 		{
 			gAgent.setAFK();
 		}

indra/newview/skins/default/xui/en-us/floater_about.xml

@@ -12,7 +12,7 @@
     <panel border="false" label="Credits" height="386" name="credits_panel">
       <!--Note to Translators: Please do not translate the following text_editor-->
       <text_editor enabled="false" follows="left|top" bg_readonly_color="transparent" left="3" max_length="65536" name="credits_editor" top="-1" bottom="0" width="443" word_wrap="true">
-Singularity Viewer is developed and maintained by Siana Gearz, Shyotl Kuhr, Aleric Inglewood, Narv Czervik, Tigh MacFanatic, Inusaito Kanya, Sovereign Engineer and Latif Khalifa, with contributions by Damian Zhaoying, Fractured Crystal, Franxisco Romano, Fritigern Gothly, Henri Beauchamp, McCabe Maxsted, Kadah Coba, Kitty Barnett, nhede Core, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Thickbrick Sleaford, Wolfspirit Magic, Zauber Parecelsus and others. Singularity is based upon Ascent source code. Credits for Ascent include Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and others. Ascent is based upon the Inertia source code.
+Singularity Viewer is developed and maintained by Siana Gearz, Shyotl Kuhr, Aleric Inglewood, Narv Czervik, Tigh MacFanatic, Inusaito Kanya, Sovereign Engineer and Latif Khalifa, with contributions by Damian Zhaoying, Fractured Crystal, Franxisco Romano, Fritigern Gothly, Henri Beauchamp, Knolan Falconer, Kadah Coba, Kitty Barnett, McCabe Maxsted, nhede Core, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Thickbrick Sleaford, Wolfspirit Magic, Zauber Parecelsus and others. Singularity is based upon Ascent source code. Credits for Ascent include Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and others. Ascent is based upon the Inertia source code.
 
 Singularity Viewer includes source code contributions of the following residents: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, and Zipherius Turas.
 

indra/newview/skins/default/xui/en-us/floater_about_land.xml

@@ -195,6 +195,7 @@
 			     halign="center" height="20" label="Buy Land..."
 			     label_selected="Buy Land..." left="155" mouse_opaque="true"
 			     name="Buy Land..." scale_image="true" width="100" />
+            <button name="Scripts..." label="Script Info" bottom="-372" follows="left|top" height="20" left="10" width="140"/>
 			<button bottom="-372" enabled="false" follows="left|top" font="SansSerif"
 			     halign="center" height="20" label="Buy For Group..."
 			     label_selected="Buy For Group..." left="260" mouse_opaque="true"
@@ -744,6 +745,7 @@ Only large parcels can be listed in search.
 			     mouse_opaque="true" name="MatureCheck" radio_style="false"
 			     tool_tip=" "
 			     width="107" />
+			<check_box name="GamingCheck" label="This parcel is used for gaming" bottom_delta="0" left="178" follows="left|top" height="16"/>
 			<string name="mature_check_mature">
 				Mature Content
 			</string>

indra/newview/skins/default/xui/en-us/floater_directory.xml

@@ -68,6 +68,7 @@
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="450" mouse_opaque="true"
 			     name="incadult" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSearchAll" follows="right|top" bottom="-58" left="550"/>
 	                <button bottom="-22" enabled="true" follows="right|top" font="SansSerif"
                              halign="center" height="18" label="?" label_selected="?" left="-25"
                              mouse_opaque="true" name="?" width="18" />
@@ -116,6 +117,7 @@
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="420" mouse_opaque="true"
 			     name="incadult" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingClassifieds" follows="right|top" bottom="-22" left="520"/>
 			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
 			     max_chars="20" mouse_opaque="true" name="Category" width="158">
 				<combo_item name="AnyCategory" value="0">
@@ -281,6 +283,7 @@
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="420" mouse_opaque="true"
 			     name="incadult" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingEvents" follows="right|top" bottom="-58" left="520"/>
 			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
 			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
 			     visible="true" width="95" />
@@ -379,6 +382,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="420" mouse_opaque="true"
 			     name="incadult" tab_group="9" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingLand" follows="right|top" bottom="-58" left="520"/>
 			<combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
 			     max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
 				<combo_item name="AllTypes" value="All Types">
@@ -473,6 +477,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="420" mouse_opaque="true"
 			     name="incadult" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSims" follows="right|top" bottom="-58" left="520"/>
 			<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
 			     max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
 				<combo_item name="AnyCategory" value="any">

indra/newview/skins/default/xui/en-us/floater_directory2.xml

@@ -43,6 +43,7 @@
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left_delta="120" mouse_opaque="true"
 			     name="incadult" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSearchAll" follows="right|top" bottom="-22" left_delta="120"/>
 			<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
 			     draw_heading="false" fg_disable_color="1, 1, 1, 1"
 			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
@@ -93,6 +94,7 @@
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="420" mouse_opaque="true"
 			     name="incadult" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingClassifieds" follows="right|top" bottom="-58" left="520"/>
 			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
 			     max_chars="20" mouse_opaque="true" name="Category" width="158">
 				<combo_item name="AnyCategory" value="0">
@@ -258,6 +260,7 @@
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="420" mouse_opaque="true"
 			     name="incadult" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingEvents" follows="right|top" bottom="-58" left="520"/>
 			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
 			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
 			     visible="true" width="95" />
@@ -316,6 +319,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="420" mouse_opaque="true"
 			     name="incadult" tab_group="9" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingLand" follows="right|top" bottom="-58" left="420"/>
 			<combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
 			     max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
 				<combo_item name="AllTypes" value="All Types">
@@ -410,6 +414,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="420" mouse_opaque="true"
 			     name="incadult" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSims" follows="right|top" bottom="-58" left="420"/>
 			<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
 			     max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
 				<combo_item name="AnyCategory" value="any">
@@ -604,6 +609,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left_delta="110" mouse_opaque="true"
 			     name="incadult" width="204" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingGroups" follows="right|top" bottom="-46" left_delta="110"/>
 			<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
 			     draw_heading="true"
 			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"

indra/newview/skins/default/xui/en-us/floater_directory3.xml

@@ -43,6 +43,7 @@
 				  font="SansSerifSmall" height="16" initial_value="false"
 				  label="Adult content" left_delta="120" mouse_opaque="true"
 				  name="incadult" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSearchAll" follows="right|top" bottom="-22" left_delta="120"/>
 			 <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
 				  draw_heading="false" fg_disable_color="1, 1, 1, 1"
 				  follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
@@ -126,6 +127,7 @@
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="450" mouse_opaque="true"
 			     name="incadult" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSearchAll" follows="right|top" bottom="-58" left="550"/>
 	                <button bottom="-22" enabled="true" follows="right|top" font="SansSerif"
                              halign="center" height="18" label="?" label_selected="?" left="-25"
                              mouse_opaque="true" name="?" width="18" />
@@ -174,6 +176,7 @@
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="420" mouse_opaque="true"
 			     name="incadult" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingClassifieds" follows="right|top" bottom="-22" left="520"/>
 			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
 			     max_chars="20" mouse_opaque="true" name="Category" width="158">
 				<combo_item name="AnyCategory" value="0">
@@ -339,6 +342,7 @@
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="420" mouse_opaque="true"
 			     name="incadult" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingEvents" follows="right|top" bottom="-58" left="520"/>
 			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
 			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
 			     visible="true" width="95" />
@@ -437,6 +441,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="420" mouse_opaque="true"
 			     name="incadult" tab_group="9" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingLand" follows="right|top" bottom="-58" left="520"/>
 			<combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
 			     max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
 				<combo_item name="AllTypes" value="All Types">
@@ -531,6 +536,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left="420" mouse_opaque="true"
 			     name="incadult" width="156" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingSims" follows="right|top" bottom="-58" left="520"/>
 			<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
 			     max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
 				<combo_item name="AnyCategory" value="any">
@@ -725,6 +731,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 		     font="SansSerifSmall" height="16" initial_value="false"
 			     label="Adult content" left_delta="110" mouse_opaque="true"
 			     name="incadult" width="204" />
+            <check_box name="filter_gaming" label="Hide Gaming" control_name="FilterGamingGroups" follows="right|top" bottom="-46" left_delta="110"/>
 			<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
 			     draw_heading="true"
 			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"

indra/newview/skins/default/xui/en-us/floater_god_tools.xml

@@ -60,7 +60,9 @@
 			     initial_value="false" label="Sandbox" left="10" mouse_opaque="true"
 			     name="is sandbox" tool_tip="Toggle whether this is a sandbox region."
 			     width="180" />
-			<button bottom_delta="-52" follows="top|right" font="SansSerifSmall" halign="center"
+			<check_box name="is gaming" label="Gaming" tool_tip="Toggle whether this is a gaming region." bottom_delta="-20" follows="left|top"/>
+			<check_box name="hide from search" label="Hide region from search" tool_tip="Toggle whether this region is searchable at all." bottom_delta="-20" follows="left|top"/>
+			<button bottom_delta="-32" follows="top|right" font="SansSerifSmall" halign="center"
 			     height="20" label="Bake Terrain" label_selected="Bake Terrain" left="8"
 			     mouse_opaque="true" name="Bake Terrain"
 			     tool_tip="Save the current terrain as default." width="110" />

indra/newview/skins/default/xui/en-us/floater_script_limits.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_close="true"
+ can_minimize="true"
+ can_resize="true"
+ min_height="260"
+ height="570"
+ help_topic="scriptlimits"
+ layout="topleft"
+ name="scriptlimits"
+ rect_control="FloaterScriptLimitsRect"
+ title="Script Information"
+ min_width="400"
+ width="480">
+    <tab_container
+     top="555"
+     follows="left|right|top|bottom"
+     layout="topleft"
+     left="1"
+     name="scriptlimits_panels"
+     right="-1"
+     tab_position="top"
+     bottom="0" />
+</floater>

indra/newview/skins/default/xui/en-us/menu_viewer.xml

@@ -544,6 +544,7 @@
 			<on_click function="Tools.ReleaseKeys" userdata="" />
 			<on_enable function="Tools.EnableReleaseKeys" userdata="" />
 		</menu_item_call>
+		<menu_item_call name="insert_agent"/>
 		<menu_item_separator bottom="-232" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator4" width="185" />
 		<menu_item_call bottom="-232" enabled="true" height="19" label="Account History..." left="0"
@@ -592,6 +593,7 @@
 		     mouse_opaque="true" name="Region/Estate..." shortcut="alt|R" width="185">
 			<on_click function="ShowFloater" userdata="about region" />
 		</menu_item_call>
+		<menu_item_call name="insert_world"/>
 		<menu_item_separator bottom="-316" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator6" width="185" />
 		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
@@ -698,6 +700,7 @@
 			<on_click function="ToggleControl" userdata="ShowSelectionBeam" />
 			<on_check control="ShowSelectionBeam" />
 		</menu_item_check>
+		<menu_item_call name="insert_tools"/>
 		<menu_item_separator bottom="-159" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator2" width="250" />
 		<menu_item_check bottom="-178" enabled="false" height="19" label="Snap to Grid" left="0"

indra/newview/skins/default/xui/en-us/panel_media_remote.xml

@@ -4,4 +4,7 @@
      name="media_remote" use_bounding_rect="true" width="220">
 	<panel bottom="1" filename="panel_bg_tab.xml" height="22" left="0" width="220" />
 	<panel bottom="3" filename="panel_media_controls.xml" height="20" left="0" width="220" />
+	<string name="Title">Title</string>
+	<string name="Artist">Artist</string>
+	<string name="Now_playing">Now playing</string>
 </panel>

indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml

@@ -15,9 +15,6 @@
 	<string name="pause_label">
 		Pause
 	</string>
-	<string name="Title">Title</string>
-	<string name="Artist">Artist</string>
-	<string name="Now_playing">Now playing</string>
 	<string name="default_tooltip_label">
 		No Media Specified
 	</string>

indra/newview/skins/default/xui/en-us/panel_preferences_general.xml

@@ -55,7 +55,7 @@
 		<combo_item name="Hungarian" value="hu">Magyar(Hungarian)*</combo_item>
 		<combo_item name="Dutch" value="nl">Nederlands(Dutch)*</combo_item>
 		<combo_item name="Polish" value="pl">Polski(Polish)*</combo_item>
-		<combo_item name="Portugese" value="pt">Portugués(Portuguese)*</combo_item>
+		<combo_item name="Portugese" value="pt">Portugués(Portuguese)</combo_item>
  		<combo_item name="Russian" value="ru">Русский(Russian)*</combo_item>
 		<combo_item name="Turkish" value="tr">Türkçe(Turkish)*</combo_item>
  		<combo_item name="Ukrainian" value="uk">Українська(Ukrainian)*</combo_item>

indra/newview/skins/default/xui/en-us/panel_script_limits_my_avatar.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ mouse_opaque="false"
+ follows="top|left"
+ height="570"
+ label="My Avatar"
+ layout="topleft"
+ left="0"
+ name="script_limits_my_avatar_panel"
+ top="0"
+ width="480">
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="16"
+	 layout="topleft"
+	 left="10"
+	 name="script_memory"
+	 top_pad="24"
+	 width="480">
+		Avatar Script Usage
+	</text>
+
+	<text
+	 follows="left|top"
+	 height="16"
+	 layout="topleft"
+	 top_delta="18"
+	 visible="false"/>
+
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="16"
+	 layout="topleft"
+	 left="30"
+	 name="memory_used"
+	 top_delta="18"
+	 width="480">
+
+	</text>
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="16"
+	 layout="topleft"
+	 left="30"
+	 name="urls_used"
+	 top_delta="18"
+	 width="480">
+
+	</text>
+	<text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="loading_text"
+     top_delta="12"
+     width="480">
+        Loading...
+    </text>
+    <scroll_list
+     draw_heading="true"
+     follows="all"
+     height="409"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     sort_column="0"
+     sort_ascending="true"
+     name="scripts_list"
+     top_delta="16"
+     width="460">
+        <column
+         label="Size (kb)"
+         name="size"
+         width="70" />
+        <column
+         label="URLs"
+         name="urls"
+         width="50" />
+        <column
+         label="Object"
+         name="name"
+         width="210" />
+        <column
+         label="Location"
+         name="location"
+         width="130" />
+    </scroll_list>
+    <button
+     follows="bottom|left"
+     height="19"
+     label="Refresh List"
+     layout="bottomleft"
+     left_pad="5"
+     name="refresh_list_btn"
+     bottom_delta="-34"
+     left="10"
+     width="100" />
+</panel>

indra/newview/skins/default/xui/en-us/panel_script_limits_region_memory.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ mouse_opaque="false"
+ follows="top|left"
+ height="570"
+ label="Region Memory"
+ layout="topleft"
+ name="script_limits_region_memory_panel"
+ top="0"
+ left="0"
+ width="480">
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="16"
+	 layout="topleft"
+	 left="10"
+	 name="script_memory"
+	 top_pad="24"
+	 width="480">
+	   Parcel Script Memory
+	</text>
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="16"
+	 layout="topleft"
+	 left="30"
+	 name="parcels_listed"
+	 top_delta="18"
+	 visible="true"
+	 width="480">
+
+	</text>
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="16"
+	 layout="topleft"
+	 left="30"
+	 name="memory_used"
+	 top_delta="18"
+	 width="480">
+	</text>
+
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="16"
+	 layout="topleft"
+	 left="30"
+	 name="urls_used"
+	 top_delta="18"
+	 width="480">
+
+	</text>
+	<text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="loading_text"
+     top_delta="12"
+     width="480">
+        Loading...
+    </text>
+    <scroll_list
+     draw_heading="true"
+     follows="all"
+     height="409"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     sort_column="0"
+     sort_ascending="true"
+     name="scripts_list"
+     top_delta="16"
+     width="460">
+        <column
+         label="Size (kb)"
+         name="size"
+         width="70" />
+        <column
+         label="URLs"
+         name="urls"
+         width="50" />
+        <column
+         label="Object"
+         name="name"
+         width="70" />
+        <column
+         label="Owner"
+         name="owner"
+         width="90" />
+        <column
+         label="Parcel"
+         name="parcel"
+         width="100" />
+        <column
+         label="Location"
+         name="location"
+         width="80" />
+    </scroll_list>
+    <button
+     follows="bottom|left"
+     height="19"
+     label="Refresh List"
+     layout="bottomleft"
+     left_pad="5"
+     name="refresh_list_btn"
+     bottom_delta="-34"
+     left="10"
+     width="100" />
+    <button
+     follows="bottom|right"
+     height="19"
+     label="Highlight"
+	 visible="false"
+     layout="bottomright"
+     left="370"
+     name="highlight_btn"
+     bottom_delta="0"
+     width="100" />
+    <button
+     follows="bottom|right"
+     height="19"
+     label="Return"
+	 visible="false"
+     layout="bottomright"
+     name="return_btn"
+     bottom_delta="0"
+     left_delta="-105"
+     width="100" />
+</panel>

indra/newview/skins/default/xui/en-us/strings.xml

@@ -3169,6 +3169,60 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="RegionInfoAllowedResidents">Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string>
 	<string name="RegionInfoAllowedGroups">Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string>
 
+	<!-- script limits floater -->
+	<string name="ScriptLimitsParcelScriptMemory">Parcel Script Memory</string>
+	<string name="ScriptLimitsParcelsOwned">Parcels Listed: [PARCELS]</string>
+	<string name="ScriptLimitsMemoryUsed">Memory used: [COUNT] kb out of [MAX] kb; [AVAILABLE] kb available</string>
+	<string name="ScriptLimitsMemoryUsedSimple">Memory used: [COUNT] kb</string>
+	<string name="ScriptLimitsParcelScriptURLs">Parcel Script URLs</string>
+	<string name="ScriptLimitsURLsUsed">URLs used: [COUNT] out of [MAX]; [AVAILABLE] available</string>
+	<string name="ScriptLimitsURLsUsedSimple">URLs used: [COUNT]</string>
+	<string name="ScriptLimitsRequestError">Error requesting information</string>
+	<string name="ScriptLimitsRequestNoParcelSelected">No Parcel Selected</string>
+	<string name="ScriptLimitsRequestWrongRegion">Error: script information is only available in your current region</string>
+	<string name="ScriptLimitsRequestWaiting">Retrieving information...</string>
+	<string name="ScriptLimitsRequestDontOwnParcel">You do not have permission to examine this parcel</string>
+
+	<string name="SITTING_ON">Sitting On</string>
+	<string name="ATTACH_CHEST">Chest</string>
+	<string name="ATTACH_HEAD">Head</string>
+	<string name="ATTACH_LSHOULDER">Left Shoulder</string>
+	<string name="ATTACH_RSHOULDER">Right Shoulder</string>
+	<string name="ATTACH_LHAND">Left Hand</string>
+	<string name="ATTACH_RHAND">Right Hand</string>
+	<string name="ATTACH_LFOOT">Left Foot</string>
+	<string name="ATTACH_RFOOT">Right Foot</string>
+	<string name="ATTACH_BACK">Back</string>
+	<string name="ATTACH_PELVIS">Pelvis</string>
+	<string name="ATTACH_MOUTH">Mouth</string>
+	<string name="ATTACH_CHIN">Chin</string>
+	<string name="ATTACH_LEAR">Left Ear</string>
+	<string name="ATTACH_REAR">Right Ear</string>
+	<string name="ATTACH_LEYE">Left Eye</string>
+	<string name="ATTACH_REYE">Right Eye</string>
+	<string name="ATTACH_NOSE">Nose</string>
+	<string name="ATTACH_RUARM">Right Upper Arm</string>
+	<string name="ATTACH_RLARM">Right Lower Arm</string>
+	<string name="ATTACH_LUARM">Left Upper Arm</string>
+	<string name="ATTACH_LLARM">Left Lower Arm</string>
+	<string name="ATTACH_RHIP">Right Hip</string>
+	<string name="ATTACH_RULEG">Right Upper Leg</string>
+	<string name="ATTACH_RLLEG">Right Lower Leg</string>
+	<string name="ATTACH_LHIP">Left Hip</string>
+	<string name="ATTACH_LULEG">Left Upper Leg</string>
+	<string name="ATTACH_LLLEG">Left Lower Leg</string>
+	<string name="ATTACH_BELLY">Belly</string>
+	<string name="ATTACH_RPEC">Right Pec</string>
+	<string name="ATTACH_LPEC">Left Pec</string>
+	<string name="ATTACH_HUD_CENTER_2">HUD Center 2</string>
+	<string name="ATTACH_HUD_TOP_RIGHT">HUD Top Right</string>
+	<string name="ATTACH_HUD_TOP_CENTER">HUD Top Center</string>
+	<string name="ATTACH_HUD_TOP_LEFT">HUD Top Left</string>
+	<string name="ATTACH_HUD_CENTER_1">HUD Center 1</string>
+	<string name="ATTACH_HUD_BOTTOM_LEFT">HUD Bottom Left</string>
+	<string name="ATTACH_HUD_BOTTOM">HUD Bottom</string>
+	<string name="ATTACH_HUD_BOTTOM_RIGHT">HUD Bottom Right</string>
+
 	<!-- panel contents -->
 	<string name="PanelContentsNewScript">New Script</string>
 
@@ -4069,6 +4123,9 @@ Try enclosing path to the editor with double quotes.
  <string name="ExternalEditorCommandParseError">Error parsing the external editor command.</string>
  <string name="ExternalEditorFailedToRun">External editor failed to run.</string>
 
+  <string name="Left">Left</string>
+  <string name="Right">Right</string>
+
   <!-- Pathfinding -->
   <string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
   <string name="Pathfinding_Object_Attr_None">None</string>
@@ -4076,9 +4133,6 @@ Try enclosing path to the editor with double quotes.
   <string name="Pathfinding_Object_Attr_Character">Character</string>
   <string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
 
-  <string name="Left">Left</string>
-  <string name="Right">Right</string>
-
   <!-- teleport_strings.xml's strings we need -->
   <string name="completed_from">Teleport completed from</string>
 

indra/newview/skins/default/xui/es/panel_preferences_general.xml

@@ -115,7 +115,7 @@
 			Polski(Polaco)*
 		</combo_item>
 		<combo_item name="Portugese">
-			Portugués(Portugués)*
+			Portugués(Portugués)
 		</combo_item>
 		<combo_item name="Russian">
 			Русский(Ruso)*

indra/newview/skins/default/xui/fr/floater_snapshot.xml

@@ -4,6 +4,9 @@
 		Destination de la photo
 	</text>
 	<radio_group label="Type de photo" name="snapshot_type_radio" width="228">
+		<radio_item name="feed">
+			Poster sur my.secondlife.com
+		</radio_item>
 		<radio_item name="postcard">
 			Envoyez par e-mail
 		</radio_item>
@@ -95,6 +98,22 @@
 	</combo_box>
 	<spinner label="Largeur" label_width="41" name="snapshot_width" width="101"/>
 	<spinner label="Hauteur" label_width="41" left="121" name="snapshot_height" width="101"/>
+	<text name="type_label3">Ratio de l'image</text>
+	<combo_box name="feed_aspect_combo">
+		<combo_item name="Default">Défaut</combo_item>
+	</combo_box>
+	<combo_box name="postcard_aspect_combo">
+		<combo_item name="Default">Défaut</combo_item>
+	</combo_box>
+	<combo_box name="texture_aspect_combo">
+		<combo_item name="CurrentWindow">Fenêtre actuelle</combo_item>
+	</combo_box>
+	<combo_box name="local_aspect_combo">
+		<combo_item name="Default">Defaut</combo_item>
+		<combo_item name="CurrentWindow">Fenêtre actuelle</combo_item>
+		<combo_item name="Custom">Personnaliser</combo_item>
+	</combo_box>
+
 	<slider label="Qualité de l&apos;image" name="image_quality_slider"/>
 	<text name="layer_type_label">
 		Capturez:
@@ -116,9 +135,11 @@
 	<check_box label="Voir l'interface sur la photo" name="ui_check"/>
 	<check_box label="Voir les éléments HUD sur la photo" name="hud_check"/>
 	<check_box label="Garder ouvert après enregistrement" name="keep_open_check"/>
+	<check_box label="Ouvrir le panneau en mode geler la vue" name="freeze_time_check" tool_tip="Gelez l'image, jouez avec la cam pour choisir différents angles de vue."/>
 	<check_box label="Imposer les proportions" name="keep_aspect_check"/>
 	<check_box label="Prévisualisation plein écran (geler l'écran)" name="freeze_frame_check"/>
 	<button label="Rafraîchir" name="new_snapshot_btn"/>
+	<button label="Geler la vue" name="freeze_time_btn" width="110" tool_tip="Bloque la vue et montre celle ci figée en plein écran, permet de jouer avec la cam et de prendre en photo selon plusieurs angles. ESC pour quitter."/>
 	<check_box label="Rafraîchissement automatique" name="auto_snapshot_check"/>
 	<button label="Enregistrer ([UPLOADFEE])" name="upload_btn" width="118"/>
 	<button label="Envoyer" name="send_btn" width="118"/>
@@ -131,9 +152,7 @@
 		</flyout_button_item>
 	</flyout_button>
 	<button label="Annuler" name="discard_btn" left="133" width="72" />
-	<check_box bottom_delta="-20" follows="left|top" control_name="TemporaryUpload" enabled="true"
+	<check_box label="Image Temporaire (Gratuit)" name="temp_check" tooltip="Comme toute image temporaire elle disparaitra à votre deconnection."/>
-             initial_value="false" label="Image Temporaire (Gratuit)" left="10"
-             name="temp_check" tooltip="Comme toute image temporaire elle disparaitra à votre deconnection." />
 	<string name="unknown">
 		inconnu
 	</string>

indra/newview/skins/default/xui/fr/menu_viewer.xml

@@ -4,6 +4,7 @@
     <menu_item_call label="Import  d'image ([UPLOADFEE])" name="Upload Image"/>
     <menu_item_call label="Import de son ([UPLOADFEE])" name="Upload Sound"/>
     <menu_item_call label="Import d'animation ([UPLOADFEE])" name="Upload Animation"/>
+    <menu_item_call label="Import de Mesh" name="Upload Mesh"/>
     <menu_item_call label="Import  multiples ([UPLOADFEE] par fichier)" name="Bulk Upload"/>
 	<menu_item_call label="Import XML" name="Import"/>
 	<menu_item_call label="Import avec textures" name="Import2"/>
@@ -135,6 +136,9 @@
 		</menu_item_call>
 		<menu_item_call label="Acheter des [CURRENCY]" name="Buy and Sell L$..."/>
 		<menu_item_separator label="-----------" name="separator5"/>
+        <menu_item_call label="Mes Ensembles" name="My Outfits"/>
+        <menu_item_call label="Favoris" name="Favorites"/>
+        <menu_item_separator label="-----------" name="separator5"/>
 		<menu_item_call label="Mes terrains" name="My Land..."/>
 		<menu_item_call label="À propos du terrain" name="About Land..."/>
 		<menu_item_call label="Acheter le terrain" name="Buy Land..."/>

indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml

@@ -1,211 +1,77 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
+<panel label="Syst&#xE8;me" name="ascsys">
-  label="Syst&#xE8;me" name="ascsys">
   <tab_container label="Singularity System" name="Ascent System">
 
     <panel label="G&#xE9;n&#xE9;ral" name="User Interface">
-      <check_box
+      <check_box label="Activer le TP avec le double-clic" tool_tip="Activer le TP sur un objet/une personne avec le double-clic" name="double_click_teleport_check"/>
-        label="Activer le TP avec le double-clic" left="10"
+      <check_box label="R&#xE9;initialiser la cam&#xE9;ra apr&#xE8;s le TP" tool_tip="Centre la cam&#xE9;ra derri&#xE8;re vous apr&#xE8;s un TP." name="center_after_teleport_check"/>
-        tool_tip="Activer le TP sur un objet/une personne avec le double-clic"
+      <check_box label="Compenser la cible du TP" tool_tip="Essaye de cibler le TP pour que vos pieds atterrissent au point vis&#xE9;" name="offset_teleport_check"/>
-        name="double_click_teleport_check"
+      <check_box name="fly_after_tp" label="Toujours voler apres un TP" tool_tip="Comme ça on reste pas bloqué sur le teston des gens !!!!."/>
-        width="400" />
+      <check_box name="continue_flying" label="Voleter quand on se lève" tool_tip="vous voletez quand vous faites stand, pratique pour les avi d'oiseaux, de fées etc..."/>
-      <check_box
+      <check_box label="Preview animations on the avatar - Test temporaire d&#x27;une animation" tool_tip="L&#x27;animation est jou&#xE9;e avec votre avatar avant d&#x27;&#xEA;tre t&#xE9;l&#xE9;charg&#xE9;e." name="preview_anim_in_world_check"/>
-        label="R&#xE9;initialiser la cam&#xE9;ra apr&#xE8;s le TP" left="20"
+      <check_box label="Enregistrer les scripts syst&#xE9;matiquement en Mono" tool_tip="Compile les scripts en Mono quand cela est possible." name="save_scripts_as_mono_check"/>
-        tool_tip="Centre la cam&#xE9;ra derri&#xE8;re vous apr&#xE8;s un TP."
+      <check_box label="Rezzer les objets avec le groupe du terrain quand cela est possible" tool_tip="Rez les objets avec le m&#xEA;me groupe que le terrain, ind&#xE9;pendamment de votre tag actif." name="always_rez_in_group_check"/>
-        name="center_after_teleport_check"
+      <check_box label="Toujours montrer le bouton construire activ&#xE9;" tool_tip="Permet d&#x27;acc&#xE9;der &#xE0; au bouton construire en permanence, sans pour autant avoir le droit de construire." name="always_build_check"/>
-        width="400" />
+      <check_box label="Toujours permettre le mode vol (Fly)" tool_tip="Permet de voler quelques soient les droits de la sim, &#xE0; vos risques et p&#xE9;rils." name="always_fly_check"/>
-      <check_box
+      <check_box label="D&#xE9;sactiver la distance minimum de la cam&#xE9;ra" tool_tip="La cam&#xE9;ra zoome de tr&#xE9;s pr&#xE8;s." name="disable_camera_zoom_check"/>
-        label="Compenser la cible du TP" left="20"
+      <check_box label="Activer les fonctions Power User - &#xE0; vos risques et p&#xE9;rils !" tool_tip="Ajoute des fonctions consid&#xE9;r&#xE9;es trop dangereuses pour une utilisation normale. Ces fonctions peuvent faire des ravages si employ&#xE9;es improprement." name="power_user_check"/>
-        tool_tip="Essaye de cibler le TP pour que vos pieds atterrissent au point vis&#xE9;"
+      <check_box label="Confirmer les fonctions Power User" tool_tip="Confirme les fonctions Power User. A vos risques et p&#xE9;rils. Singularity n'est pas responsable de cette utilisation." name="power_user_confirm_check"/>
-        name="offset_teleport_check"
+      <check_box label="Activer l&#x27;Ascent System Inventory (Red&#xE9;marrage n&#xE9;cessaire)" tool_tip="Cr&#xE9;e un nouveau dossier dans l&#x27;inventaire afin de stocker les fichiers de settings et les assets non permanents." name="system_folder_check"/>
-        width="400" />
+      <check_box label="Les t&#xE9;l&#xE9;chargements temporaires vont dans le dossier : System Inventory &#x3E; Assets" tool_tip="Place les t&#xE9;l&#xE9;chargements temporaires dans le dossier : System Inventory &#x3E; Assets ce qui permet de les retrouver plus ais&#xE9;ment" name="temp_in_system_check"/>
-      <check_box
+      <check_box label="Pr&#xE9;charger l&#x27;inventaire &#xE0; la connection" tool_tip="R&#xE9;duit l&#x27;attente lors de votre recherche initiale dans l&#x27;inventaire" name="fetch_inventory_on_login_check"/>
-        label="Preview animations on the avatar - Test temporaire d&#x27;une animation" left="10"
+      <check_box label="Activer les effets de vent" name="enable_wind"/>
-        tool_tip="L&#x27;animation est jou&#xE9;e avec votre avatar avant d&#x27;&#xEA;tre t&#xE9;l&#xE9;charg&#xE9;e."
+      <check_box label="Activer les nuages" name="enable_clouds"/>
-        name="preview_anim_in_world_check"
+      <check_box label="Activer les nuages classiques" name="enable_classic_clouds"/>
-        width="400" />
+      <check_box label="Activer le rezz rapide par rapport &#xE0; une distance progressive" name="speed_rez_check" tool_tip="Active, cette fonction charge progressivement les textures du plus pr&#xE8;s au plus loin"/>
-      <check_box
+      <spinner label="Intervalle distance/affichage:" name="speed_rez_interval"/>
-        label="Enregistrer les scripts syst&#xE9;matiquement en Mono" left="10"
+      <text name="speed_rez_seconds">secondes</text>
-        tool_tip="Compile les scripts en Mono quand cela est possible."
-        name="save_scripts_as_mono_check"
-        width="400" />
-      <check_box
-        label="Rezzer les objets avec le groupe du terrain quand cela est possible" left="10"
-        tool_tip="Rez les objets avec le m&#xEA;me groupe que le terrain, ind&#xE9;pendamment de votre tag actif."
-        mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
-        width="400" />
-      <check_box
-        label="Toujours montrer le bouton construire activ&#xE9;" left="10"
-        tool_tip="Permet d&#x27;acc&#xE9;der &#xE0; au bouton construire en permanence, sans pour autant avoir le droit de construire."
-        name="always_build_check"
-        width="400" />
-      <check_box
-        label="Toujours permettre le mode vol (Fly)" left="10"
-        tool_tip="Permet de voler quelques soient les droits de la sim, &#xE0; vos risques et p&#xE9;rils."
-        name="always_fly_check"
-        width="400" />
-      <check_box
-        label="D&#xE9;sactiver la distance minimum de la cam&#xE9;ra" left="10"
-        tool_tip="La cam&#xE9;ra zoome de tr&#xE9;s pr&#xE8;s."
-        name="disable_camera_zoom_check"
-        width="400" />
-      <check_box
-        label="Activer les fonctions Power User - &#xE0; vos risques et p&#xE9;rils !" left="10"
-        tool_tip="Ajoute des fonctions consid&#xE9;r&#xE9;es trop dangereuses pour une utilisation normale. Ces fonctions peuvent faire des ravages si employ&#xE9;es improprement."
-        name="power_user_check"
-        width="400" />
-      <check_box
-        label="Confirmer les fonctions Power User" left="20"
-        tool_tip="Confirme les fonctions Power User. A vos risques et p&#xE9;rils. Singularity n'est pas responsable de cette utilisation."
-        name="power_user_confirm_check"
-        width="400" />
-      <check_box
-        label="Activer l&#x27;Ascent System Inventory (Red&#xE9;marrage n&#xE9;cessaire)" left="10"
-        tool_tip="Cr&#xE9;e un nouveau dossier dans l&#x27;inventaire afin de stocker les fichiers de settings et les assets non permanents."
-        name="system_folder_check"
-        width="400" />
-      <check_box
-        label="Les t&#xE9;l&#xE9;chargements temporaires vont dans le dossier : System Inventory &#x3E; Assets" left="20"
-        tool_tip="Place les t&#xE9;l&#xE9;chargements temporaires dans le dossier : System Inventory &#x3E; Assets ce qui permet de les retrouver plus ais&#xE9;ment"
-        name="temp_in_system_check"
-        width="400" />
-      <check_box
-        label="Pr&#xE9;charger l&#x27;inventaire &#xE0; la connection" left="10"
-        tool_tip="R&#xE9;duit l&#x27;attente lors de votre recherche initiale dans l&#x27;inventaire"
-        name="fetch_inventory_on_login_check"
-        width="400" />
-      <check_box
-        label="Activer les effets de vent" left="10"
-        name="enable_wind"
-        width="400" />
-      <check_box
-        label="Activer les nuages" left="10"
-        name="enable_clouds"
-        width="400" />
-      <check_box
-        label="Activer les nuages classiques" left="10"
-        mouse_opaque="true" name="enable_classic_clouds"
-        width="400" />
-      <check_box left_delta="-10"
-        label="Activer le rezz rapide par rapport &#xE0; une distance progressive" left="10"
-        name="speed_rez_check"
-        tool_tip="Active, cette fonction charge progressivement les textures du plus pr&#xE8;s au plus loin"
-        width="400" />
-      <spinner
-        width="230"
-        label="Intervalle distance/affichage:" label_width="180"
-        name="speed_rez_interval" />
-      <text name="speed_rez_seconds" width="100">
-secondes
-      </text>
     </panel>
 
     <panel label="Commandes Texte" name="Command Line">
-      <check_box label="Activer l'usage de la barre de chat comme ligne de commande" left="10"
+      <check_box label="Activer l'usage de la barre de chat comme ligne de commande" name="chat_cmd_toggle"/>
-        name="chat_cmd_toggle" width="270"/>
+      <text name="cmd_line_text_2">Tp &#224; travers la sim (usage: cmd x y z)</text>
-      <text name="cmd_line_text_2" width="512">
+      <line_editor name="AscentCmdLinePos"/>
-Tp &#224; travers la sim (usage: cmd x y z)
+      <text name="cmd_line_text_3">Tp au sol (usage: cmd)</text>
-      </text>
+      <line_editor name="AscentCmdLineGround"/>
-      <line_editor name="AscentCmdLinePos" width="200"/>
+      <text name="cmd_line_text_4">Tp en altitude (usage: cmd z)</text>
-      <text name="cmd_line_text_3" width="512">
+      <line_editor name="AscentCmdLineHeight"/>
-Tp au sol (usage: cmd)
+      <text name="cmd_line_text_5">Tp &#x22;ET, rentrer maison !&#x22; (usage: cmd)</text>
-      </text>
+      <line_editor name="AscentCmdLineTeleportHome"/>
-      <line_editor name="AscentCmdLineGround" width="200"/>
+      <text name="cmd_line_text_6">Rezzer une plateforme (usage: cmd 0 - 30)</text>
-      <text name="cmd_line_text_4" width="512">
+      <line_editor name="AscentCmdLineRezPlatform"/>
-Tp en altitude (usage: cmd z)
+      <slider name="AscentPlatformSize" label="Dimensions:" tool_tip="Quelle taille voulez-vous ?"/>
-      </text>
+      <text name="cmd_line_text_8">Calculette (usage: cmd 2 + 2)</text>
-      <line_editor name="AscentCmdLineHeight" width="200"/>
+      <line_editor name="AscentCmdLineCalc"/>
-      <text name="cmd_line_text_5" width="512">
+      <text name="cmd_line_text_15">Vider l'historique du chat (usage: cmd)</text>
-Tp &#x22;ET, rentrer maison !&#x22; (usage: cmd)
+      <line_editor name="AscentCmdLineClearChat"/>
-      </text>
-      <line_editor name="AscentCmdLineTeleportHome" width="200"/>
-      <text name="cmd_line_text_6" width="512">
-Rezzer une plateforme (usage: cmd 0 - 30)
-      </text>
-      <line_editor name="AscentCmdLineRezPlatform" width="200"/>
-      <slider name="AscentPlatformSize" label="Dimensions:" label_width="75"
-        tool_tip="Quelle taille voulez-vous ?"/>
-      <text name="cmd_line_text_8" width="512">
-Calculette (usage: cmd 2 + 2)
-      </text>
-      <line_editor name="AscentCmdLineCalc" width="200"/>
-      <text name="cmd_line_text_15" width="512">
-Vider l&apos;historique du chat (usage: cmd)
-      </text>
-      <line_editor name="AscentCmdLineClearChat" width="200"/>
       <!-- Column Split -->
-      <text name="cmd_line_text_9" width="512">
+      <text name="cmd_line_text_9">Changer le "Draw Distance" (usage: cmd metres)</text>
-Changer le "Draw Distance" (usage: cmd metres)
+      <line_editor name="AscentCmdLineDrawDistance"/>
-      </text>
+      <text bname="cmd_line_text_10">Tp &#224; la position de la cam (usage: cmd)</text>
-      <line_editor name="AscentCmdLineDrawDistance" width="200"/>
+      <line_editor name="AscentCmdTeleportToCam"/>
-      <text bname="cmd_line_text_10" width="512">
+      <text name="cmd_line_text_11">Avoir un nom avec la clef (usage: cmd clef)</text>
-Tp &#224; la position de la cam (usage: cmd)
+      <line_editor name="AscentCmdLineKeyToName"/>
-      </text>
+      <text name="cmd_line_text_12">Tp un avatar avec la clef (usage: cmd clef)</text>
-      <line_editor name="AscentCmdTeleportToCam" width="200"/>
+      <line_editor name="AscentCmdLineOfferTp"/>
-      <text name="cmd_line_text_11" width="512">
+      <text name="cmd_line_text_7">Tp sur une sim x (usage: cmd nomdelasim)</text>
-Avoir un nom avec la clef (usage: cmd clef)
+      <line_editor name="AscentCmdLineMapTo"/>
-      </text>
+      <check_box label="Utiliser la meme position entre les sims" name="map_to_keep_pos"/>
-      <line_editor name="AscentCmdLineKeyToName" width="200"/>
+      <text name="cmd_line_text_13">Se tp vers un avatar (usage: cmd nom)</text>
-      <text name="cmd_line_text_12" width="512">
+      <line_editor tool_tip="Cette syntaxe permet les noms partiels." name="AscentCmdLineTP2"/>
-Tp un avatar avec la clef (usage: cmd clef)
-      </text>
-      <line_editor name="AscentCmdLineOfferTp" width="200"/>
-      <text name="cmd_line_text_7" width="512">
-Tp sur une sim x (usage: cmd nomdelasim)
-      </text>
-      <line_editor name="AscentCmdLineMapTo" width="200"/>
-      <check_box
-        label="Utiliser la meme position entre les sims" left_delta="0"
-        name="map_to_keep_pos" width="270"/>
-      <text name="cmd_line_text_13" width="512">
-Se tp vers un avatar (usage: cmd nom)
-      </text>
-      <line_editor
-        tool_tip="Cette syntaxe permet les noms partiels."
-        name="AscentCmdLineTP2" width="200"/>
       <text name="cmd_line_text_14">Active/d&#xE9;sactive le faux absent (usage: cmd)</text>
-      <line_editor name="SinguCmdLineAway" width="200"/>
+      <line_editor name="SinguCmdLineAway"/>
     </panel>
 
     <panel label="S&#xE9;curit&#xE9;" name="Security">
-      <check_box
+      <check_box label="Emettre les effets du viewer (Excluant les rayons)" name="broadcast_viewer_effects"/>
-        label="Emettre les effets du viewer (Excluant les rayons)" left="10"
+      <check_box label="D&#xE9;sactiver le &#x22;Pointer vers&#x22; &#xE0; l&#x22;&#xE9;dition d&#x27;un objet" tool_tip="Masque le pointeur sur l&#x27;objet  &#xE9;dit&#xE9;" name="disable_point_at_and_beams_check"/>
-        name="broadcast_viewer_effects"
+      <check_box label="Ne pas &#x22;Regarder vers&#x22;" tool_tip="Supprime les mouvements de t&#xEA;te, et le &#x22;Regarder vers&#x22; pour soi-m&#xEA;me" name="private_look_at_check"/>
-        width="400" />
+      <check_box label="Voir quand les autres &#x22;Regardent vers&#x22;" tool_tip="Montre o&#xF9; les autres regardent." name="show_look_at_check"/>
-      <check_box
+      <check_box label="Détache automatiquement ce rodjudju de LSL Bridge" tool_tip="détache le LSL Bridge de Phoenix et/ou Firestorm viewer." name="detach_bridge"/>
-        label="D&#xE9;sactiver le &#x22;Pointer vers&#x22; &#xE0; l&#x22;&#xE9;dition d&#x27;un objet" left="10"
+      <check_box label="Prendre discr&#xE8;tement un photo, sur votre disque dur" tool_tip="Permet de prendre une photo en mode &#x22;espionnage&#x22;, sans bruit d&#x27;appareil, ni mouvement de cam&#xE9;ra, ni gesture. (Uniquement vers le disque dur)." name="quiet_snapshots_check"/>
-        tool_tip="Masque le pointeur sur l&#x27;objet  &#xE9;dit&#xE9;"
+      <check_box label="En vous levant, annule les permissions que l&#x27;objet a sur votre avatar" tool_tip="Evite que l&#x27;objet garde le contr&#xF4;le de votre avatar, comme par exemple les animations." name="revoke_perms_on_stand_up_check"/>
-        name="disable_point_at_and_beams_check"
+      <check_box label="D&#xE9;sactive le &#x22;Click to sit&#x22; automatique" tool_tip="D&#xE9;sactive llSitTarget. Vous devrez s&#xE9;lectionner vous m&#xEA;me la fonction &#x22;sit&#x22; sur l&#x27;objet." name="disable_click_sit_check"/>
-        width="400" />
+      <check_box label="Affiche les changements de d&#xE9;comptes de scripts de la r&#xE9;gion." name="totalscriptjumps" tool_tip="D&#xE9;pendant du seuil que vous choisissez dans la fen&#xEA;tre &#xE0; droite."/>
-      <check_box
-        label="Ne pas &#x22;Regarder vers&#x22;" left="10"
-        tool_tip="Supprime les mouvements de t&#xEA;te, et le &#x22;Regarder vers&#x22; pour soi-m&#xEA;me"
-        name="private_look_at_check"
-        width="400" />
-      <check_box
-        label="Voir quand les autres &#x22;Regardent vers&#x22;" left="10"
-        tool_tip="Montre o&#xF9; les autres regardent."
-        name="show_look_at_check"
-        width="400" />
-       <check_box label="Détache automatiquement ce rodjudju de LSL Bridge" tool_tip="détache le LSL Bridge de Phoenix et/ou Firestorm viewer." name="detach_bridge"/>
-       <check_box
-       label="Prendre discr&#xE8;tement un photo, sur votre disque dur" 
-       tool_tip="Permet de prendre une photo en mode &#x22;espionnage&#x22;, sans bruit d&#x27;appareil, ni mouvement de cam&#xE9;ra, ni gesture. (Uniquement vers le disque dur)." 
-       name="quiet_snapshots_check"/>
-       <check_box
-        label="En vous levant, annule les permissions que l&#x27;objet a sur votre avatar" left="10"
-        tool_tip="Evite que l&#x27;objet garde le contr&#xF4;le de votre avatar, comme par exemple les animations."
-        name="revoke_perms_on_stand_up_check"
-        width="400" />
-      <check_box
-        label="D&#xE9;sactive le &#x22;Click to sit&#x22; automatique" left="10"
-        tool_tip="D&#xE9;sactive llSitTarget. Vous devrez s&#xE9;lectionner vous m&#xEA;me la fonction &#x22;sit&#x22; sur l&#x27;objet."
-        name="disable_click_sit_check"
-        width="400" />
-      <check_box
-        label="Affiche les changements de d&#xE9;comptes de scripts de la r&#xE9;gion." left_delta="0"
-        name="totalscriptjumps" width="270"
-        tool_tip="D&#xE9;pendant du seuil que vous choisissez dans la fen&#xEA;tre &#xE0; droite."/>
       <spinner left_delta="350" name="ScriptJumpCount" tool_tip="Threshold for the script jump message [Default: 100]"/>
     </panel>
 
@@ -213,7 +79,7 @@ Se tp vers un avatar (usage: cmd nom)
       <text name="text_box6">Point de Pivot</text>
       <check_box label="Valeurs en %" name="EmPivotPercToggle"/>
       <check_box label="Active les &#x22;Highlights&#x22; sur les prims s&#xE9;lectionn&#xE9;s" name="EmBuildPrefsRenderHighlight_toggle"/>
-	  <check_box label="Axe sur le Root Prim" name="EmBuildPrefsActualRoot_toggle"/>
+      <check_box label="Axe sur le Root Prim" name="EmBuildPrefsActualRoot_toggle"/>
       <text name="text_box7">Permissions :</text>
       <check_box label="Phantom" name="EmPhantomToggle"/>
       <check_box label="Physical" name="EmPhysicalToggle"/>
@@ -225,4 +91,4 @@ Se tp vers un avatar (usage: cmd nom)
     </panel>
 
   </tab_container>
-</panel>
+</panel>

indra/newview/skins/default/xui/fr/panel_preferences_general.xml

@@ -56,7 +56,7 @@ de sélection :
 		<combo_item name="Hungarian">Magyar (Hongrois) - Bêta</combo_item>
 		<combo_item name="Dutch">Nederlands (Néerlandais) - Bêta</combo_item>
 		<combo_item name="Polish">Polski (Polonais) - Bêta</combo_item>
-		<combo_item name="Portugese">Portugués (Portugais) - Bêta</combo_item>
+		<combo_item name="Portugese">Portugués (Portugais)</combo_item>
 		<combo_item name="Russian">Русский (Russe) - Bêta</combo_item>
 		<combo_item name="Turkish">Türkçe (Turc) - Bêta</combo_item>
 		<combo_item name="Ukrainian">Українська (Ukrainien) - Bêta</combo_item>

indra/newview/skins/default/xui/pt/floater_about_land.xml

@@ -0,0 +1,523 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterland" title="Sobre o Terreno">
+	<tab_container name="landtab">
+		<panel label="Geral" name="land_general_panel">
+			<text name="Name:">
+				Nome:
+			</text>
+			<text name="Description:">
+				Descrição:
+			</text>
+			<text name="LandType">
+				Tipo:
+			</text>
+			<text name="LandTypeText">
+				Continente / Terra
+			</text>
+			<text name="ContentRating">
+				Classificação:
+			</text>
+			<text name="ContentRatingText">
+				Adult
+			</text>
+			<text name="Owner:">
+				Proprietário:
+			</text>
+			<text name="OwnerText">
+				Leyla Linden
+			</text>
+			<button label="Perfil..." label_selected="Perfil..." name="Profile..."/>
+			<text name="Group:">
+				Grupo:
+			</text>
+			<button label="Ajustar..." label_selected="Ajustar..." name="Set..."/>
+			<check_box label="Permitir posse para o grupo" name="check deed" tool_tip="O gerente do grupo pode acionar essa terra ao grupo, então esta será mantida pelo gestor da ilha"/>
+			<button label="Passar..." label_selected="Passar..." name="Deed..." tool_tip="Você só pode delegar esta terra se você for um gerente selecionado pelo grupo."/>
+			<check_box label="Proprietário faz contribuição com delegação" name="check contrib" tool_tip="Quando a terra é delegada ao grupo, o proprietário anterior contribui alocando terra suficiente para mantê-la."/>
+			<text name="For Sale:">
+				À Venda:
+			</text>
+			<text name="Not for sale.">
+				Não está à Venda.
+			</text>
+			<text name="For Sale: Price L$[PRICE].">
+				Preço: [CURRENCY][PRICE] ([CURRENCY][PRICE_PER_SQM]/m²).
+			</text>
+			<button label="Vender Terra..." label_selected="Vender Terra..." name="Sell Land..."/>
+			<text name="For sale to">
+				À venda para: [BUYER]
+			</text>
+			<text name="Sell with landowners objects in parcel.">
+				À venda (Objetos incluídos).
+			</text>
+			<text name="Selling with no objects in parcel.">
+				À venda (Objetos não incluídos).
+			</text>
+			<button label="Cancelar venda do terreno" label_selected="Cancelar venda do terreno" left="275" name="Cancel Land Sale" width="165"/>
+			<text name="Claimed:">
+				Reclamado:
+			</text>
+			<text name="DateClaimText">
+				Ter Ago 15 13:47:25 2006
+			</text>
+			<text name="PriceLabel">
+				Área:
+			</text>
+			<text name="PriceText">
+				4048 m²
+			</text>
+			<text name="Traffic:">
+				Tráfego:
+			</text>
+			<text name="DwellText">
+				0
+			</text>
+			<button label="Comprar Terra..." label_selected="Comprar Terra..." left="130" name="Buy Land..." width="125"/>
+			<button label="Comprar para o Grupo..." label_selected="Comprar para o Grupo..." name="Buy For Group..."/>
+			<button label="Comprar Passe..." label_selected="Comprar Passe..." left="130" name="Buy Pass..." tool_tip="Um passe concede a você acesso temporário a esta terra." width="125"/>
+			<button label="Abandonar Terra.." label_selected="Abandonar Terra.." name="Abandon Land..."/>
+			<button label="Reclamar Terra..." label_selected="Reclamar Terra..." name="Reclaim Land..."/>
+			<button label="Venda Linden..." label_selected="Venda Linden..." name="Linden Sale..." tool_tip="A terra precisa ser possuída, estar com o conteúdo configurado e não estar pronta para leilão."/>
+			<string name="new users only">
+				Somente novos usuários
+			</string>
+			<string name="anyone">
+				Qualquer um
+			</string>
+			<string name="area_text">
+				Área
+			</string>
+			<string name="area_size_text">
+				[AREA] m²
+			</string>
+			<string name="auction_id_text">
+				ID do Leilão: [ID]
+			</string>
+			<string name="need_tier_to_modify">
+				Você deve ter sua compra aprovada para modificar este terreno.
+			</string>
+			<string name="group_owned_text">
+				(Possuído pelo Grupo)
+			</string>
+			<string name="profile_text">
+				Perfil...
+			</string>
+			<string name="info_text">
+				Informação...
+			</string>
+			<string name="public_text">
+				(público)
+			</string>
+			<string name="none_text">
+				(nenhum)
+			</string>
+			<string name="sale_pending_text">
+				(Venda Pendente)
+			</string>
+			<string name="no_selection_text">
+				Nenhum lote selecionado.
+Vá para o menu Mundo &gt; Sobre a Terra ou selecione outro lote para mostrar seus detalhes.
+			</string>
+		</panel>
+		<panel label="Corretor" name="land_covenant_panel">
+			<text name="estate_section_lbl">
+				Propriedade:
+			</text>
+			<text name="estate_name_lbl">
+				Nome:
+			</text>
+			<text name="estate_name_text">
+				mainland
+			</text>
+			<text name="estate_owner_lbl">
+				Dono:
+			</text>
+			<text name="estate_owner_text">
+				(nenhum)
+			</text>
+			<text_editor name="covenant_editor">
+				Não há corretor para esta Propriedade.
+			</text_editor>
+			<text name="covenant_timestamp_text">
+				Última Alteração: Qua, Dez 31 16:00:00 1969
+			</text>
+			<text name="region_section_lbl">
+				Região:
+			</text>
+			<text name="region_name_lbl">
+				Nome:
+			</text>
+			<text name="region_name_text">
+				leyla
+			</text>
+			<text name="region_landtype_lbl">
+				Tipo:
+			</text>
+			<text name="region_landtype_text">
+				Continente / Terra
+			</text>
+			<text name="region_maturity_lbl">
+				Classificação:
+			</text>
+			<text name="region_maturity_text">
+				Adult
+			</text>
+			<text name="resellable_lbl">
+				Revender:
+			</text>
+			<text name="resellable_clause">
+				Terra nesta região não pode ser revendida.
+			</text>
+			<text name="changeable_lbl">
+				Subdividir:
+			</text>
+			<text name="changeable_clause">
+				Terra nesta região não pode ser unida/sub-dividida.
+			</text>
+			<string name="can_resell">
+				Terra comprada nesta região pode ser revendida.
+			</string>
+			<string name="can_not_resell">
+				Terra comprada nesta região não pode ser revendida.
+			</string>
+			<string name="can_change">
+				Terra comprada nesta região pode ser compartilhada
+ou sub-dividida.
+			</string>
+			<string name="can_not_change">
+				Terra comprada nesta região não pode ser compartilhada
+ou sub-dividida.
+			</string>
+		</panel>
+		<panel label="Objetos" name="land_objects_panel">
+			<text name="parcel_object_bonus">
+				Fator de Bonus para Objetos na Região: [BONUS]
+			</text>
+			<text name="Simulator primitive usage:">
+				Uso do simulador de primitivas:
+			</text>
+			<text left="214" name="objects_available" width="230">
+				[COUNT] de [MAX] ([AVAILABLE] disponíveis)
+			</text>
+			<string name="objects_available_text">
+				[COUNT] de [MAX] ([AVAILABLE] disponíveis)
+			</string>
+			<string name="objects_deleted_text">
+				[COUNT] de [MAX] ([DELETED] serão deletados)
+			</string>
+			<text name="Primitives parcel supports:" width="200">
+				Primitivas suportadas pelo lote:
+			</text>
+			<text left="214" name="object_contrib_text" width="152">
+				[COUNT]
+			</text>
+			<text name="Primitives on parcel:">
+				Primitivas no Lote:
+			</text>
+			<text left="214" name="total_objects_text" width="48">
+				[COUNT]
+			</text>
+			<text left="14" name="Owned by parcel owner:" width="180">
+				Pertencentes ao dono do lote:
+			</text>
+			<text left="214" name="owner_objects_text" width="48">
+				[COUNT]
+			</text>
+			<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/>
+			<button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/>
+			<text left="14" name="Set to group:" width="180">
+				Configurados ao grupo:
+			</text>
+			<text left="214" name="group_objects_text" width="48">
+				[COUNT]
+			</text>
+			<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/>
+			<button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..." right="-10" tool_tip="Retornar os objetos para seus donos." width="119"/>
+			<text left="14" name="Owned by others:" width="128">
+				Propriedade de Outros:
+			</text>
+			<text left="214" name="other_objects_text" width="48">
+				[COUNT]
+			</text>
+			<button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/>
+			<button label="Retornar..." label_selected="Retornar..." name="ReturnOther..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/>
+			<text left="14" name="Selected / sat upon:" width="193">
+				Selecionado/Sentado:
+			</text>
+			<text left="214" name="selected_objects_text" width="48">
+				[COUNT]
+			</text>
+			<text left="4" name="Autoreturn" width="412">
+				Auto-retornar objetos dos outros residentes (minutos, 0 para desligado):
+			</text>
+			<line_editor name="clean other time" right="-10"/>
+			<text name="Object Owners:">
+				Donos dos Objetos:
+			</text>
+			<button label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh List" left="118"/>
+			<button label="Retornar objetos..." label_selected="Retornar objetos..." name="Return objects..." left="230"/>
+			<name_list name="owner list">
+				<column label="Tipo" name="type"/>
+				<column label="Nome" name="name"/>
+				<column label="Contar" name="count"/>
+				<column label="Mais recente" name="mostrecent"/>
+			</name_list>
+		</panel>
+		<panel label="Opções" name="land_options_panel">
+			<text name="allow_label">
+				Permitir outros residentes a:
+			</text>
+			<check_box label="Editar Terreno" name="edit land check" tool_tip="Se ativado, qualquer um pode modificar a forma da sua terra. É melhor deixar esta opção desativada, uma vez que você sempre pode editar seu próprio terreno."/>
+			<check_box label="Criar Landmarks" name="check landmark"/>
+			<check_box label="Voar" name="check fly" tool_tip="Se ativado, os Residentes podem voar na sua terra. Se desativado, eles podem voar apenas para dentro e por cima de sua terra."/>
+			<text name="allow_label2" left="172">
+				Criar Objetos:
+			</text>
+			<check_box label="Residentes" name="edit objects check"/>
+			<check_box label="Grupo" name="edit group objects check"/>
+			<text name="allow_label3" left="172">
+				Entrada do Objeto:
+			</text>
+			<check_box label="Residentes" name="all object entry check"/>
+			<check_box label="Grupo" name="group object entry check"/>
+			<text name="allow_label4" left="172">
+				Executar Scripts:
+			</text>
+			<check_box label="Residentes" name="check other scripts"/>
+			<check_box label="Grupo" name="check group scripts"/>
+			<text name="land_options_label">
+				Opções de Terra:
+			</text>
+			<check_box label="Salvo (sem dano)" name="check safe" tool_tip="Se ativado, ajusta o terreno para Seguro, desabilitando combate com danos. Se não ativado, o combate com danos é habilitado."/>
+			<check_box label="Sem Empurrar" name="PushRestrictCheck" tool_tip="Evita scripts que empurram. A ativação dessa opção pode ser útil para prevenir comportamentos desordeiros na sua terra."/>
+			<check_box label="Mostra o Lugar na Busca ([DIRECTORYFEE]) sob" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/>
+			<string name="search_enabled_tooltip">
+				Permitir que as pessoas vejam este lote nos resultados de busca
+			</string>
+			<string name="search_disabled_small_tooltip">
+				Esta opção está desabilitada porque a área deste lote tem 128 m² ou menos.
+Apenas lotes maiores podem ser listados na busca.
+			</string>
+			<string name="search_disabled_permissions_tooltip">
+				Esta opção está desabilitada porque você não pode modificar as opções deste lote.
+			</string>
+			<combo_box name="land category with adult" left="265" width="155">
+				<combo_item name="AnyCategory">
+					Qualquer Categoria
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Local da Linden
+				</combo_item>
+				<combo_item name="Adult">
+					Adult
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Artes &amp; Cultura
+				</combo_item>
+				<combo_item name="Business">
+					Negócios
+				</combo_item>
+				<combo_item name="Educational">
+					Educacional
+				</combo_item>
+				<combo_item name="Gaming">
+					Jogos
+				</combo_item>
+				<combo_item name="Hangout">
+					Moradia
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Amigável a  Novos Usuários
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parques &amp; Natureza
+				</combo_item>
+				<combo_item name="Residential">
+					Residencial
+				</combo_item>
+				<combo_item name="Shopping">
+					Shopping
+				</combo_item>
+				<combo_item name="Other">
+					Outros
+				</combo_item>
+			</combo_box>
+			<combo_box name="land category" left="265" width="155">
+				<combo_item name="AnyCategory">
+					Qualquer Categoria
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Locação Linden
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Artes e Cultura
+				</combo_item>
+				<combo_item name="Business">
+					Negócios
+				</combo_item>
+				<combo_item name="Educational">
+					Educacional
+				</combo_item>
+				<combo_item name="Gaming">
+					Jogo
+				</combo_item>
+				<combo_item name="Hangout">
+					Lazer
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Amigável para novatos
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parques e Natureza
+				</combo_item>
+				<combo_item name="Residential">
+					Residencial
+				</combo_item>
+				<combo_item name="Shopping">
+					Compras
+				</combo_item>
+				<combo_item name="Other">
+					Outros
+				</combo_item>
+			</combo_box>
+			<button label="?" label_selected="?" left="426" name="?"/>
+			<check_box label="Conteúdo Mature" name="MatureCheck" tool_tip=""/>
+			<string name="mature_check_mature">
+				Conteúdo Mature
+			</string>
+			<string name="mature_check_adult">
+				Conteúdo Adult
+			</string>
+			<string name="mature_check_mature_tooltip">
+				A informação do seu lote ou seu conteúdo são considerados mature.
+			</string>
+			<string name="mature_check_adult_tooltip">
+				A informação do seu lote ou seu conteúdo são considerados adult.
+			</string>
+			<text name="Snapshot:">
+				Foto:
+			</text>
+			<texture_picker label="" name="snapshot_ctrl" tool_tip="Clique para escolher uma imagem"/>
+			<text name="landing_point">
+				Ponto de Aterrissagem: [LANDING]
+			</text>
+			<string name="landing_point_none">
+				(nenhum)
+			</string>
+			<button label="Definir" label_selected="Definir" name="Set" tool_tip="Define o ponto de aterrissagem aonde o visitante chega. Define para o ponto em que seu avatar se encontra neste lote."/>
+			<button label="Limpar" label_selected="Limpar" name="Clear" tool_tip="Limpar o ponto de aterrissagem."/>
+			<text name="Teleport Routing: ">
+				Rota de Tele-transporte:
+			</text>
+			<combo_box width="160" left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote.">
+				<combo_item name="Blocked">
+					Bloqueado
+				</combo_item>
+				<combo_item name="LandingPoint">
+					Ponto de Aterrissagem
+				</combo_item>
+				<combo_item name="Anywhere">
+					Qualquer lugar
+				</combo_item>
+			</combo_box>
+			<string name="push_restrict_text">
+				Sem Empurrar
+			</string>
+			<string name="push_restrict_region_text">
+				Sem Empurrar (Imposição na Região)
+			</string>
+		</panel>
+		<panel label="Mídia" name="land_media_panel">
+			<text name="with media:" width="85">
+				Tipo de Mídia:
+			</text>
+			<combo_box left="97" name="media type" tool_tip="Especificar se a URL é um filme, uma página web ou outra mídia"/>
+			<text name="at URL:" width="85">
+				URL da Mídia:
+			</text>
+			<line_editor left="97" name="media_url"/>
+			<button label="Definir..." label_selected="Definir..." name="set_media_url"/>
+			<text name="Description:">
+				Descrição:
+			</text>
+			<line_editor left="97" name="url_description" tool_tip="Texto mostrado ao lado do botão reproduzir/carregar"/>
+			<text name="Media texture:">
+				Substituir
+Textura:
+			</text>
+			<texture_picker label="" left="97" name="media texture" tool_tip="Clique para escolher uma imagem"/>
+			<text name="replace_texture_help">
+				(Objetos usando esta textura, mostrarão o filme ou
+a página web depois que você clicar na seta de
+reproduzir.)
+			</text>
+			<text name="Options:">
+				Opções de
+Mídia:
+			</text>
+			<check_box label="Escala automática" left="97" name="media_auto_scale" tool_tip="Marcando esta opção o conteúdo se ajustará ao lote automaticamente. A mídia pode se tornar lenta e com baixa qualidade visual mas nenhum outro ajuste de textura ou alinhamento será necessário."/>
+			<check_box label="Mídia em Repetição" name="media_loop" tool_tip="Executar a mídia repetidamente. Quando a mídia terminar a execução, ela reiniciará do começo."/>
+			<text left="102" name="media_size" tool_tip="Tamanho para desenhar a mídia Web, deixar 0 como padrão." width="115">
+				Tamanho da mídia:
+			</text>
+			<spinner left_delta="99" name="media_size_width" tool_tip="Tamanho para desenhar a mídia Web, deixar 0 como padrão."/>
+			<spinner name="media_size_height" tool_tip="Tamanho para desenhar a mídia Web, deixar 0 como padrão."/>
+			<text name="pixels">
+				pixels
+			</text>
+			<text name="MusicURL:">
+				URL da Música:
+			</text>
+			<line_editor left="97" name="music_url"/>
+			<text name="Sound:">
+				Som:
+			</text>
+			<check_box label="Restringir gestos e sons de objetos a este lote" left="97" name="check sound local"/>
+			<button label="?" label_selected="?" name="?"/>
+			<text name="Voice settings:">
+				Voz:
+			</text>
+			<check_box left="97" label="Habilitar Voz" name="parcel_enable_voice_channel"/>
+			<check_box left="97" label="Habilitar Voz (definida pela Propriedade)" name="parcel_enable_voice_channel_is_estate_disabled"/>
+			<check_box left="117" label="Restringir Voz a este lote" name="parcel_enable_voice_channel_parcel"/>
+		</panel>
+		<panel label="Acesso" name="land_access_panel">
+			<text name="Limit access to this parcel to:">
+				Acesso a Este Lote
+			</text>
+			<check_box label="Permitir Acesso Público" name="public_access"/>
+			<text name="Only Allow">
+				Bloquear Acesso por:
+			</text>
+			<check_box label="Residentes que não forneceram informações de pagamento para a Linden Lab" name="limit_payment" tool_tip="Banir residentes não identificados."/>
+			<check_box label="Residentes que não tiveram a idade de adulto confirmada" name="limit_age_verified" tool_tip="Banir residentes que não tiveram sua idade verificada. Veja support.secondlife.com para maiores informações."/>
+			<string name="estate_override">
+				Uma ou mais destas opções está definida no nível de propriedade.
+			</string>
+			<check_box label="Permitir Acesso do Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/>
+			<check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/>
+			<combo_box name="pass_combo">
+				<combo_item name="Anyone">
+					Qualquer um
+				</combo_item>
+				<combo_item name="Group">
+					Grupo
+				</combo_item>
+			</combo_box>
+			<spinner label="Preço em [CURRENCY]:" name="PriceSpin"/>
+			<spinner label="Horas de Acesso:" name="HoursSpin"/>
+			<text label="Permitir Sempre" name="AllowedText">
+				Residentes Permitidos
+			</text>
+			<name_list name="AccessList" tool_tip="([LISTED] listados, [MAX] máximo)"/>
+			<button label="Adicionar..." label_selected="Adicionar..." name="add_allowed"/>
+			<button label="Remover" label_selected="Remover" name="remove_allowed"/>
+			<text label="Banir" name="BanCheck">
+				Residentes Banidos
+			</text>
+			<name_list name="BannedList" tool_tip="([LISTED] listados, [MAX] máximo)"/>
+			<button label="Adicionar..." label_selected="Adicionar..." name="add_banned"/>
+			<button label="Remover" label_selected="Remover" name="remove_banned"/>
+		</panel>
+	</tab_container>
+</floater>

indra/newview/skins/default/xui/pt/floater_active_speakers.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="active_speakers" title="Falantes Ativos">
+	<panel name="active_speakers_panel">
+		<scroll_list name="speakers_list">
+			<column label="Nome" name="speaker_name"/>
+		</scroll_list>
+		<panel name="volume_container">
+			<button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
+		</panel>
+	</panel>
+</floater>

indra/newview/skins/default/xui/pt/floater_animation_preview.xml

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Animation Preview" title="">
+	<text name="name_label">
+		Nome:
+	</text>
+	<text name="description_label">
+		Descrição:
+	</text>
+	<spinner label_width="72" width="110" label="Prioridade" name="priority" tool_tip="Controla quais animações podem se sobrepor a esta animação."/>
+	<check_box label="Loop" name="loop_check" tool_tip="Executa a animação repetidamente."/>
+	<spinner label_width="56" left="65" width="116" label="Dentro(%)" name="loop_in_point" tool_tip="Ajusta o ponto da animação onde a repetição começa."/>
+	<spinner label_width="40" left="185" label="Fora(%)" name="loop_out_point" tool_tip="Ajusta o ponto da animação onde a repetição termina."/>
+	<text name="hand_label">
+		Pose de Mão
+	</text>
+	<combo_box left_delta="100"  width="184"  name="hand_pose_combo" tool_tip="Controla o que as mãos fazem durante a animação">
+		<combo_item name="Spread">
+			Espreguiçar
+		</combo_item>
+		<combo_item name="Relaxed">
+			Relaxado
+		</combo_item>
+		<combo_item name="PointBoth">
+			Apontar Ambos
+		</combo_item>
+		<combo_item name="Fist">
+			Punho
+		</combo_item>
+		<combo_item name="RelaxedLeft">
+			Relaxado para Esquerda
+		</combo_item>
+		<combo_item name="PointLeft">
+			Apontar à Esquerda
+		</combo_item>
+		<combo_item name="FistLeft">
+			Punho Esquerdo
+		</combo_item>
+		<combo_item name="RelaxedRight">
+			Relaxado para Direita
+		</combo_item>
+		<combo_item name="PointRight">
+			Apontar à Direita
+		</combo_item>
+		<combo_item name="FistRight">
+			Punho Direito
+		</combo_item>
+		<combo_item name="SaluteRight">
+			Saudar à Direita
+		</combo_item>
+		<combo_item name="Typing">
+			Digitando
+		</combo_item>
+		<combo_item name="PeaceRight">
+			Pacífico à Direita
+		</combo_item>
+	</combo_box>
+	<text name="emote_label">
+		Expressão
+	</text>
+	<combo_box left_delta="100" width="184" name="emote_combo" tool_tip="Controla o que a face faz durante a animação.">
+		<combo_item name="[None]">
+			[None]
+		</combo_item>
+		<combo_item name="Aaaaah">
+			Aaaaah
+		</combo_item>
+		<combo_item name="Afraid">
+			Temeroso
+		</combo_item>
+		<combo_item name="Angry">
+			Raivoso
+		</combo_item>
+		<combo_item name="BigSmile">
+			Sorrisão
+		</combo_item>
+		<combo_item name="Bored">
+			Entediado
+		</combo_item>
+		<combo_item name="Cry">
+			Chorar
+		</combo_item>
+		<combo_item name="Disdain">
+			Desprezar
+		</combo_item>
+		<combo_item name="Embarrassed">
+			Envergonhado
+		</combo_item>
+		<combo_item name="Frown">
+			Franzir a testa
+		</combo_item>
+		<combo_item name="Kiss">
+			Beijar
+		</combo_item>
+		<combo_item name="Laugh">
+			Rir
+		</combo_item>
+		<combo_item name="Plllppt">
+			Plllppt
+		</combo_item>
+		<combo_item name="Repulsed">
+			Enojado
+		</combo_item>
+		<combo_item name="Sad">
+			Triste
+		</combo_item>
+		<combo_item name="Shrug">
+			Indiferença
+		</combo_item>
+		<combo_item name="Smile">
+			Sorriso
+		</combo_item>
+		<combo_item name="Surprise">
+			Surpreso
+		</combo_item>
+		<combo_item name="Wink">
+			Piscar
+		</combo_item>
+		<combo_item name="Worry">
+			Preocupado
+		</combo_item>
+	</combo_box>
+	<text name="preview_label" width="250">
+		Prever enquanto
+	</text>
+	<combo_box left_delta="100" width="130" name="preview_base_anim" tool_tip="Use isto para testar o comportamento de sua animação enquanto seu avatar executa ações comuns.">
+		<combo_item name="Standing">
+			Parado
+		</combo_item>
+		<combo_item name="Walking">
+			Andando
+		</combo_item>
+		<combo_item name="Sitting">
+			Sentando
+		</combo_item>
+		<combo_item name="Flying">
+			Voando
+		</combo_item>
+	</combo_box>
+	<spinner label_width="125" width="192" label="Facilitar a entrada (sec)" name="ease_in_time" tool_tip="Quantidade de tempo (em segundos) para que as animações se mesclem."/>
+	<spinner bottom_delta="-20"  label_width="125" left="10"  width="192" label="Facilitar a saída (sec)" name="ease_out_time" tool_tip="Quantidade de tempo (em segundos) para que a animações se mesclem."/>
+	<button bottom_delta="-32" name="play_btn" tool_tip="Executa/pausa sua animação."/>
+	<button label="" name="stop_btn" tool_tip="Interrompe a execução da animação."/>
+	<text name="bad_animation_text">
+		Incapaz de ler o arquivo de animação.
+
+Nós recomendamos exportar arquivos BVH do
+Poser 4.
+	</text>
+	<button label="Cancelar" name="cancel_btn"/>
+	<button label="Carregar ([UPLOADFEE])" name="ok_btn"/>
+	<string name="failed_to_initialize">
+		Não foi possível iniciar o movimento
+	</string>
+	<string name="anim_too_long">
+		O arquivo de animação tem [LENGTH] segundos de duração. 
+
+A duração máxima de animação permitida é de [MAX_LENGTH] segundos.
+	</string>
+	<string name="failed_file_read">
+		Não foi possível ler o arquivo de animação.
+
+[STATUS]
+	</string>
+</floater>

indra/newview/skins/default/xui/pt/floater_auction.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_auction" title="Iniciar a venda de terrenos da Linden">
+	<check_box label="Incluir marcador de seleção amarelo" name="fence_check"/>
+	<button label="Foto" label_selected="Foto" name="snapshot_btn"/>
+	<button label="OK" label_selected="OK" name="ok_btn"/>
+	<text name="already for sale">
+		Você não pode leiloar terrenos que já estão configurados para venda.
+	</text>
+</floater>

indra/newview/skins/default/xui/pt/floater_audio_volume.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Volume" title="">
+	<panel label="" name="Volume Panel"/>
+</floater>

indra/newview/skins/default/xui/pt/floater_avatar_picker.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarpicker" title="Escolha o Residente" min_width="285" width="285">
+	<tab_container name="ResidentChooserTabs" width="275">
+		<panel label="Buscar" name="SearchPanel">
+			<text name="InstructSearchResidentName">
+				Digite parte do nome do Residente:
+			</text>
+			<button label="Encontrar" label_selected="Encontrar" name="Find"/>
+		</panel>
+		<panel label="Cartões de Visita" name="CallingCardsPanel">
+			<text name="InstructSelectCallingCard">
+				Selecione um cartão de visita:
+			</text>
+		</panel>
+		<panel label="Próximo a Mim" name="NearMePanel">
+			<text name="InstructSelectResident">
+				Selecione residente
+próximo:
+			</text>
+			<button font="SansSerifSmall" left_delta="1" width="115" label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh"/>
+			<slider label="Faixa" name="near_me_range" bottom_delta="-36"/>
+			<text name="meters">
+				Metros
+			</text>
+		<scroll_list bottom_delta="-169" height="159" name="NearMe"  />
+		</panel>
+	</tab_container>
+	<button label="Selecionar" label_selected="Selecionar" name="Select"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<string name="not_found">
+		'[TEXT]' não encontrado
+	</string>
+	<string name="no_one_near">
+		Ninguém proximo
+	</string>
+	<string name="no_results">
+		Nenhum resultado
+	</string>
+	<string name="searching">
+		Buscando...
+	</string>
+</floater>

indra/newview/skins/default/xui/pt/floater_avatar_textures.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatar_texture_debug" title="Texturas do Avatar">
+	<text name="baked_label">
+		Texturas sobrepostas
+	</text>
+	<text name="composite_label">
+		Texturas compostas
+	</text>
+	<texture_picker label="Cabeça" name="baked_head"/>
+	<texture_picker label="Maquiagem" name="head_bodypaint"/>
+	<texture_picker label="Cabelo" name="hair"/>
+	<button label="Tombar" label_selected="Tombar" name="Dump"/>
+	<texture_picker label="Olhos" name="baked_eyes"/>
+	<texture_picker label="Olho" name="eye_texture"/>
+	<texture_picker label="Parte de cima" name="baked_upper_body"/>
+	<texture_picker label="Tatuagem para partes de cima" name="upper_bodypaint"/>
+	<texture_picker label="Camiseta" name="undershirt"/>
+	<texture_picker label="Luvas" name="gloves"/>
+	<texture_picker label="Camisa" name="shirt"/>
+	<texture_picker label="Jaqueta" name="upper_jacket"/>
+	<texture_picker label="Parte de baixo" name="baked_lower_body"/>
+	<texture_picker label="Tatuagem para partes de baixo" name="lower_bodypaint"/>
+	<texture_picker label="Roupas de baixo" name="underpants"/>
+	<texture_picker label="Meias" name="socks"/>
+	<texture_picker label="Calçados" name="shoes"/>
+	<texture_picker label="Calças" name="pants"/>
+	<texture_picker label="Jaqueta" name="jacket"/>
+	<texture_picker label="Saia" name="baked_skirt"/>
+	<texture_picker label="Saia" name="skirt_texture"/>
+</floater>

indra/newview/skins/default/xui/pt/floater_beacons.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Balizas">
+	<panel name="beacons_panel">
+		<check_box label="Objetos programados com toque apenas" name="touch_only"/>
+		<check_box label="Objetos programados" name="scripted"/>
+		<check_box label="Objetos físicos" name="physical"/>
+		<check_box label="Fontes de Som" name="sounds"/>
+		<check_box label="Fontes de Partículas" name="particles"/>
+		<check_box label="Renderização de Highlights" name="highlights"/>
+		<check_box label="Renderização de Balizas" name="beacons"/>
+		<text name="beacon_width_label">
+			Largura da Baliza
+		</text>
+	</panel>
+</floater>

indra/newview/skins/default/xui/pt/floater_build_options.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="build options floater" title="Opções de grade">
+	<spinner label="Uni. Grade (metros)" name="GridResolution" width="180" label_width="122"/>
+	<spinner label="Ext. da Grade (metros)" name="GridDrawSize" width="180" label_width="122"/>
+	<check_box label="Habilitar ajuste de sub-grade" name="GridSubUnit"/>
+	<check_box label="Mostrar as seções de cruzamento" name="GridCrossSection"/>
+	<slider label="Opacidade da grade" name="GridOpacity" width="220"/>
+</floater>

indra/newview/skins/default/xui/pt/floater_bulk_perms.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterbulkperms" title="Mudança conjunta das permissões de conteúdo">
+	<text name="applyto">
+		Tipos de Conteúdo
+	</text>
+	<check_box label="Animação" name="check_animation"/>
+	<check_box label="Partes do Corpo" name="check_bodypart"/>
+	<check_box label="Roupas" name="check_clothing"/>
+	<check_box label="Gestos" name="check_gesture"/>
+	<check_box label="Landmarks" name="check_landmark"/>
+	<check_box label="Notecards" name="check_notecard"/>
+	<check_box label="Objetos" name="check_object"/>
+	<check_box label="Scripts" name="check_script"/>
+	<check_box label="Sons" name="check_sound"/>
+	<check_box label="Texturas" name="check_texture"/>
+	<button label="Marcar Todas" label_selected="Todas" name="check_all"/>
+	<button label="Desmarcar Todas" label_selected="Nenhuma" name="check_none"/>
+	<text name="newperms">
+		Novas Permissões
+	</text>
+	<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"/>
+	<button label="Ajuda" name="help"/>
+	<button label="Aplicar" name="apply"/>
+	<button label="Fechar" name="close"/>
+	<string name="nothing_to_modify_text">
+		A seleção não contém nenhum conteúdo editável.
+	</string>
+	<string name="status_text">
+		Definindo permissões em [NAME]
+	</string>
+	<string name="start_text">
+		Iniciando solicitação de mudança de permissão...
+	</string>
+	<string name="done_text">
+		Solicitação de mudança de permissão concluída.
+	</string>
+</floater>

indra/newview/skins/default/xui/pt/floater_bumps.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_bumps" title="Colisões, impulsos e batidas">
+	<text name="none_detected">
+		Nada detectado
+	</text>
+	<text name="bump">
+		[TIME]  [FIRST] [LAST] conflitou com você
+	</text>
+	<text name="llpushobject">
+		[TIME]  [FIRST] [LAST] empurrou você com um script
+	</text>
+	<text name="selected_object_collide">
+		[TIME]  [FIRST] [LAST] o atingiu com um objeto
+	</text>
+	<text name="scripted_object_collide">
+		[TIME]  [FIRST] [LAST] o atingiu com um objeto programado
+	</text>
+	<text name="physical_object_collide">
+		[TIME]  [FIRST] [LAST] o atingiu com um objeto físico
+	</text>
+</floater>

indra/newview/skins/default/xui/pt/floater_buy_contents.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_buy_contents" title="Comprar conteúdo">
+	<text name="contains_text">
+		[NAME] contém:
+	</text>
+	<text name="buy_text">
+		Comprar por [CURRENCY][AMOUNT] de(a) [NAME]?
+	</text>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn" width="73"/>
+	<button label="Comprar" label_selected="Comprar" name="buy_btn" width="73" left_delta="-77"/>
+	<check_box label="Vestir roupa agora" name="wear_check" left_delta="-130"/>
+	<string name="no_copy_text">
+		(sem copiar)
+	</string>
+	<string name="no_modify_text">
+		(sem modificar)
+	</string>
+	<string name="no_transfer_text">
+		(sem transferir)
+	</string>
+</floater>

indra/newview/skins/default/xui/pt/floater_buy_currency.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy currency" title="Comprar Dinheiro">
+	<text name="info_buying">
+		Comprando Dinheiro:
+	</text>
+	<text name="info_cannot_buy">
+		Não pode comprar agora:
+	</text>
+	<text name="info_need_more">
+		Você precisa de mais dinheiro:
+	</text>
+	<text name="error_message">
+		Algo não está certo.
+	</text>
+	<button label="Ir para o website" name="error_web"/>
+	<text name="contacting">
+		Contatando LindeX...
+	</text>
+	<text name="buy_action_unknown">
+		Comprar [CURRENCY] no câmbio atual da LindeX
+	</text>
+	<text name="buy_action">
+		[NAME] [CURRENCY] [PRICE]
+	</text>
+	<text name="currency_action" width="60">
+		Comprar [CURRENCY]
+	</text>
+	<line_editor name="currency_amt" left_delta="65" width="70">
+		1234
+	</line_editor>
+	<text name="currency_est" left_delta="72">
+		por aproxim. US$ [USD]
+	</text>
+	<text name="getting_data">
+		Obtendo dados...
+	</text>
+	<text name="balance_label">
+		Você tem atualmente
+	</text>
+	<text name="balance_amount">
+		[CURRENCY] [AMT]
+	</text>
+	<text name="buying_label">
+		Você está comprando
+	</text>
+	<text name="buying_amount">
+		[CURRENCY] [AMT]
+	</text>
+	<text name="total_label">
+		Seu saldo será
+	</text>
+	<text name="total_amount">
+		[CURRENCY] [AMT]
+	</text>
+	<text name="purchase_warning_repurchase">
+		Confirmando esta compra só compra a moeda.
+Você precisará tentar novamente a operação.
+	</text>
+	<text name="purchase_warning_notenough">
+		Você não está comprando moeda suficiente.
+Aumente a quantidade de compra.
+	</text>
+	<button label="Fechar" name="cancel_btn"/>
+	<button label="Adquirir" name="buy_btn"/>
+	<string name="buy_currency">
+		Comprar [CURRENCY] [LINDENS] por aproximadamente US$ [USD]
+	</string>
+</floater>

indra/newview/skins/default/xui/pt/floater_buy_land.xml

@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy land" title="Comprar terra">
+	<text name="region_name_label">
+		Região:
+	</text>
+	<text name="region_name_text" left="560">
+		(desconhecido)
+	</text>
+	<text name="region_type_label">
+		Tipo:
+	</text>
+	<text name="region_type_text" left="560">
+		(desconhecido)
+	</text>
+	<text name="estate_name_label">
+		Propriedade:
+	</text>
+	<text name="estate_name_text" left="560">
+		(desconhecido)
+	</text>
+	<text name="estate_owner_label" width="105" right="565">
+		Dono da propriedade:
+	</text>
+	<text name="estate_owner_text" left="560" >
+		(desconhecido)
+	</text>
+	<text name="resellable_changeable_label">
+		Adquiriu um terreno nesta região:
+	</text>
+	<text name="resellable_clause">
+		Pode ou não ser revendida.
+	</text>
+	<text name="changeable_clause">
+		Pode ou não ser unida ou sub-dividida.
+	</text>
+	<text name="covenant_text">
+		Você deve concordar com o Corretor da Propriedade:
+	</text>
+	<text left="470" name="covenant_timestamp_text"/>
+	<text_editor name="covenant_editor">
+		Carregando...
+	</text_editor>
+	<check_box label="Eu concordo com as definições do &#10;Corretor feitas acima." name="agree_covenant"/>
+	<text name="info_parcel_label">
+		Lote:
+	</text>
+	<text name="info_parcel">
+		Scotopteryx 138,204
+	</text>
+	<text name="info_size_label">
+		Tamanho:
+	</text>
+	<text name="info_size">
+		1024 m²
+	</text>
+	<text name="info_price_label">
+		Preço:
+	</text>
+	<text name="info_price">
+		[CURRENCY] 1500
+([CURRENCY] 1.1/m²)
+vendido com os objetos
+	</text>
+	<text name="info_action">
+		Comprar este lote irá:
+	</text>
+	<text name="error_message">
+		Algo ainda não está correto.
+	</text>
+	<button label="Ir para a página da web" name="error_web" width="150" />
+	<text name="account_action">
+		Evoluir sua conta para membro Premium
+	</text>
+	<text name="account_reason">
+		Somente membros Premium podem possuir terra.
+	</text>
+	<combo_box name="account_level">
+		<combo_item name="US$9.95/month,billedmonthly">
+			US$9.95/mês, debitado mensalmente
+		</combo_item>
+		<combo_item name="US$7.50/month,billedquarterly">
+			US$7.50/mês, debitado trimestralmente
+		</combo_item>
+		<combo_item name="US$6.00/month,billedannually">
+			US$6.00/mês, debitado anualmente
+		</combo_item>
+	</combo_box>
+	<text name="land_use_action">
+		Aumente sua taxa de locação de terra para US$ 40/mês.
+	</text>
+	<text name="land_use_reason">
+		Você possui 1309 m² de terra.
+Este lote tem 512 m² de terra.
+	</text>
+	<text name="purchase_action">
+		Pagar ao Residente Joe [CURRENCY]4000 pela terra
+	</text>
+	<text name="currency_reason">
+		Você tem [CURRENCY]2,100.
+	</text>
+	<text name="currency_action" width="116">
+		Compre [CURRENCY] adicionais
+	</text>
+	<line_editor name="currency_amt" left="190" width="65">
+		1000
+	</line_editor>
+	<text name="currency_est">
+		por aproxim. US$ [AMOUNT2]
+	</text>
+	<text name="currency_balance">
+		Você tem [CURRENCY]2,100.
+	</text>
+	<check_box label="Remover [AMOUNT] m² de contribuição do grupo." name="remove_contribution"/>
+	<button label="Adquirir" name="buy_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+	<string name="can_resell">
+		Pode ser revendida.
+	</string>
+	<string name="can_not_resell">
+		Não pode ser revendida.
+	</string>
+	<string name="can_change">
+		Pode ser unida ou subdivida.
+	</string>
+	<string name="can_not_change">
+		Não pode ser unida ou subdividida.
+	</string>
+	<string name="cant_buy_for_group">
+		Você não tem permissão para comprar terra para seu grupo ativo.
+	</string>
+	<string name="no_land_selected">
+		Nenhuma terra selecionada.
+	</string>
+	<string name="multiple_parcels_selected">
+		Múltiplos e diferentes lotes selecionados. Tente selecionar uma área menor.
+	</string>
+	<string name="no_permission">
+		Você não tem permissão para comprar uma terra para seu grupo ativo.
+	</string>
+	<string name="parcel_not_for_sale">
+		O lote selecionado não está a venda.
+	</string>
+	<string name="group_already_owns">
+		O grupo já possui o lote.
+	</string>
+	<string name="you_already_own">
+		Você já possui o lote.
+	</string>
+	<string name="set_to_sell_to_other">
+		O lote selecionado está configurado para ser vendido para outro grupo.
+	</string>
+	<string name="no_public_land">
+		A área selecionada não tem terras públicas.
+	</string>
+	<string name="not_owned_by_you">
+		Está selecionada uma terra pertencente a outro usuário. Tente selecionar uma área menor.
+	</string>
+	<string name="processing">
+		Processando sua compra...
+ 
+(Isso pode levar um minuto.)
+	</string>
+	<string name="fetching_error">
+		Houve um erro ao buscar informações sobre compra de terras.
+	</string>
+	<string name="buying_will">
+		Comprar esta terra irá:
+	</string>
+	<string name="buying_for_group">
+		Ao comprar terra para o grupo:
+	</string>
+	<string name="cannot_buy_now">
+		Não foi possível comprar agora:
+	</string>
+	<string name="not_for_sale">
+		Não disponível para venda:
+	</string>
+	<string name="none_needed">
+		nada necessário
+	</string>
+	<string name="must_upgrade">
+		Sua conta deve ser evoluída para adquirir um lote.
+	</string>
+	<string name="cant_own_land">
+		Sua conta pode possuir uma terra.
+	</string>
+	<string name="land_holdings">
+		Você possui [BUYER] m² de terra.
+	</string>
+	<string name="pay_to_for_land">
+		Pagar [CURRENCY] [AMOUNT] para [SELLER] por esta terra
+	</string>
+	<string name="buy_for_US">
+		Comprar [CURRENCY] [AMOUNT] por aprox. US$ [AMOUNT2],
+	</string>
+	<string name="parcel_meters">
+		Este lote tem [AMOUNT] m².
+	</string>
+	<string name="premium_land">
+		Esta terra é premium e será taxada como [AMOUNT] m².
+	</string>
+	<string name="discounted_land">
+		Esta terra tem desconto e será taxada como [AMOUNT] m².
+	</string>
+	<string name="meters_supports_object">
+		[AMOUNT] m²
+aceita [AMOUNT2] objetos
+	</string>
+	<string name="sold_with_objects">
+		vendido com objetos
+	</string>
+	<string name="sold_without_objects">
+		objetos não incluídos
+	</string>
+	<string name="info_price_string">
+		[CURRENCY] [PRICE]
+([CURRENCY] [PRICE_PER_SQM]/m²)
+[SOLD_WITH_OBJECTS]
+	</string>
+	<string name="insufficient_land_credits">
+		O grupo [GROUP] precisará de fundos suficientes de terras
+contribuídas para cobrir este lote antes da aquisição se completar.
+	</string>
+	<string name="have_enough_lindens">
+		Você tem [CURRENCY] [AMOUNT], suficiente para comprar este lote.
+	</string>
+	<string name="not_enough_lindens">
+		Você tem somente [CURRENCY] [AMOUNT], e precisa de mais [CURRENCY] [AMOUNT2].
+	</string>
+	<string name="balance_left">
+		Após a compra, restará [CURRENCY] [AMOUNT].
+	</string>
+	<string name="balance_needed">
+		Você precisa comprar pelo menos [CURRENCY] [AMOUNT] para ter recursos para este lote.
+	</string>
+	<string name="no_parcel_selected">
+		(nenhum lote selecionado)
+	</string>
+	<string name="buy_currency">
+		Comprar [CURRENCY] [LINDENS] por aproxim. US$ [USD]
+	</string>
+</floater>

indra/newview/skins/default/xui/pt/floater_buy_object.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="contents" title="Comprar cópia do objeto">
+	<text name="contents_text">
+		e seus conteúdos:
+	</text>
+	<text name="buy_text">
+		Comprar por [CURRENCY][AMOUNT] de(a) [NAME]?
+	</text>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Comprar" label_selected="Comprar" name="buy_btn"/>
+	<string name="title_buy_text">
+		Comprar
+	</string>
+	<string name="title_buy_copy_text">
+		Comprar uma cópia de
+	</string>
+	<string name="no_copy_text">
+		(sem copiar)
+	</string>
+	<string name="no_modify_text">
+		(sem modificar)
+	</string>
+	<string name="no_transfer_text">
+		(sem transferir)
+	</string>
+</floater>

indra/newview/skins/default/xui/pt/floater_camera.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="move floater" title="">
+	<string name="rotate_tooltip">
+		Girar a Câmera ao redor do Foco
+	</string>
+	<string name="zoom_tooltip">
+		Aproximar a Câmera in direção ao Foco
+	</string>
+	<string name="move_tooltip">
+		Mover a Câmera Para Cima e Para Baixo, Para a Esquerda e Para a Direita
+	</string>
+</floater>

indra/newview/skins/default/xui/pt/floater_chat_history.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="chat floater" title="Conversa Local">
+	<string name="ringing">
+		Conectando à conversa de Voz no mundo
+	</string>
+	<string name="connected">
+		Conectado
+	</string>
+	<string name="unavailable">
+		Voz não disponível na sua localização atual
+	</string>
+	<string name="hang_up">
+		Desconectado da conversa de Voz no mundo
+	</string>
+	<string name="voice_icon">
+		icn_voice-localchat.tga
+	</string>
+	<string name="IM_logging_string">
+		-- log ativado de Mensagem Instantânea --
+	</string>
+	<string name="IM_end_log_string">
+		-- Fim do Log --
+	</string>
+  <string name="ScriptQuestionCautionChatGranted">
+	'[OBJECTNAME]', um objeto de  '[OWNERNAME]', localizado em [REGIONNAME] a [REGIONPOS], obteve permissão para: [PERMISSIONS].
+  </string>
+  <string name="ScriptQuestionCautionChatDenied">
+	'[OBJECTNAME]', um objeto de  '[OWNERNAME]', localizado em [REGIONNAME] a [REGIONPOS], teve permissão negada para: [PERMISSIONS].
+  </string>
+  <string name="ScriptTakeMoney">
+	Tomar linden dólares ([CURRENCY]) de você
+  </string>
+  <string name="ActOnControlInputs">
+	Atue nas suas entradas de controle
+  </string>
+  <string name="RemapControlInputs">
+	Remapeie suas entradas de controle
+  </string>
+  <string name="AnimateYourAvatar">
+	Faça uma animação para o seu avatar
+  </string>
+  <string name="AttachToYourAvatar">
+	Anexe ao seu avatar
+  </string>
+  <string name="ReleaseOwnership">
+	Libere a propriedade e torne-a pública
+  </string>
+  <string name="LinkAndDelink">
+	Una e desuna de outros objetos
+  </string>
+  <string name="AddAndRemoveJoints">
+	Adicione e remova junções com outros objetos
+  </string>
+  <string name="ChangePermissions">
+	Modifique as permissões
+  </string>
+  <string name="TrackYourCamera">
+	Acompanhe sua câmera
+  </string>
+  <string name="ControlYourCamera">
+	Controle sua camera
+  </string>
+	<layout_stack name="panels">
+		<layout_panel name="im_contents_panel">
+			<combo_box label="Gestos" name="Gesture">
+				<combo_item name="Gestures">
+					Gestos
+				</combo_item>
+			</combo_box>
+			<check_box label="Mostrar texto silenciado" name="show mutes"/>
+			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Clique aqui para mostrar uma lista dos participantes ativos desta sessão de mensagem instantânea."/>
+			<panel name="chat_panel">
+				<string name="gesture_label">
+					Gestos
+				</string>
+				<line_editor label="Clique aqui para conversar." name="Chat Editor"/>
+				<flyout_button label="Falar" name="Say" tool_tip="(Entrar)">
+					<flyout_button_item name="shout_item">
+						Gritar
+					</flyout_button_item>
+					<flyout_button_item name="say_item">
+						Falar
+					</flyout_button_item>
+					<flyout_button_item name="whisper_item">
+						Sussurrar
+					</flyout_button_item>
+				</flyout_button>
+			</panel>
+		</layout_panel>
+	</layout_stack>
+</floater>

indra/newview/skins/default/xui/pt/floater_chatterbox.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="floater_chatterbox" title="Comunicar"/>

indra/newview/skins/default/xui/pt/floater_choose_group.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="groups" title="Grupos">
+	<text name="groupdesc">
+		Escolha um grupo:
+	</text>
+	<button label="OK" label_selected="OK" name="OK" />
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel" />
+</floater>

indra/newview/skins/default/xui/pt/floater_color_picker.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ColorPicker" title="Seletor de Cor">
+	<text name="r_val_text">
+		Vermelho:
+	</text>
+	<text name="g_val_text">
+		Verde:
+	</text>
+	<text name="b_val_text">
+		Azul:
+	</text>
+	<text name="h_val_text">
+		Matiz:
+	</text>
+	<text name="s_val_text">
+		Sat:
+	</text>
+	<text name="l_val_text">
+		Lum:
+	</text>
+	<check_box label="Aplicar imediatamente" name="apply_immediate"/>
+	<button left_delta="150" name="color_pipette" />
+	<button left_delta="55" label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Selecionar" label_selected="Selecionar" name="select_btn"/>
+	<text name="Current color:">
+		Cor atual:
+	</text>
+	<text name="(Drag below to save.)">
+		(Arraste abaixo
+ para salvar.)
+	</text>
+</floater>

indra/newview/skins/default/xui/pt/floater_critical.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" title=" ">
+	<button label="Continuar" label_selected="Continuar" name="Continue"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<text name="tos_heading">
+		Por favor, leia a mensagem a seguir cuidadosamente.
+	</text>
+	<text_editor name="tos_text">
+		TOS_TEXT
+	</text_editor>
+</floater>

indra/newview/skins/default/xui/pt/floater_customize.xml

@@ -0,0 +1,483 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater customize" title="Aparência" width="546">
+	<tab_container name="customize tab container" tab_min_width="115" width="544">
+		<panel label="Partes de corpo" name="body_parts_placeholder"/>
+		<panel label="Forma" name="Shape">
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+			<button label="Corpo" label_selected="Corpo" name="Body"/>
+			<button label="Cabeça" label_selected="Cabeça" name="Head"/>
+			<button label="Olhos" label_selected="Olhos" name="Eyes"/>
+			<button label="Orelhas" label_selected="Orelhas" name="Ears"/>
+			<button label="Nariz" label_selected="Nariz" name="Nose"/>
+			<button label="Boca" label_selected="Boca" name="Mouth"/>
+			<button label="Queixo" label_selected="Queixo" name="Chin"/>
+			<button label="Tórax" label_selected="Tórax" name="Torso"/>
+			<button label="Pernas" label_selected="Pernas" name="Legs"/>
+			<radio_group name="sex radio">
+				<radio_item name="radio">
+					Feminino
+				</radio_item>
+				<radio_item name="radio2">
+					Masculino
+				</radio_item>
+			</radio_group>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: não foi possível modificar
+			</text>
+			<text name="title_loading">
+				[DESC]: carregando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: não vestido
+			</text>
+			<text name="path">
+				Localizado em [PATH]
+			</text>
+			<text name="not worn instructions">
+				Coloque uma nova forma arrastando uma do seu inventário para seu avatar.
+Alternativamente, você pode criar uma nova de um esboço e usá-la.
+			</text>
+			<text name="no modify instructions">
+				Você não tem permissão para modificar esta vestimenta.
+			</text>
+			<text name="Item Action Label">
+				Forma:
+			</text>
+			<button label="Criar Nova Forma" label_selected="Criar Nova Forma" name="Create New"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
+		</panel>
+		<panel label="Pele" name="Skin">
+			<button width="115" label="Cor de Pele" label_selected="Cor de Pele" name="Skin Color"/>
+			<button width="115" label="Detalhes Faciais" label_selected="Detalhes Faciais" name="Face Detail"/>
+			<button width="115" label="Maquiagem" label_selected="Maquiagem" name="Makeup"/>
+			<button width="115" label="Detalhes do Corpo" label_selected="Detalhes do Corpo" name="Body Detail"/>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: não foi possível modificar
+			</text>
+			<text name="title_loading">
+				[DESC]: carregando..
+			</text>
+			<text name="title_not_worn">
+				[DESC]: não vestido
+			</text>
+			<text name="path">
+				Localizada em [PATH]
+			</text>
+			<text name="not worn instructions">
+				Coloque uma nova pele arrastando uma de seu inventário para seu avatar.
+Alternativamente, você pode criar uma nova forma a partir de um esboço
+e usá-la.
+			</text>
+			<text name="no modify instructions">
+				Você não tem permissão para modificar esta vestimenta.
+			</text>
+			<text name="Item Action Label">
+				Pele:
+			</text>
+			<texture_picker width="86" label="Tattoo: cabeça" name="Head Tattoos" tool_tip="Clique para escolher um desenho"/>
+			<texture_picker width="86" label="Tattoo: superior" name="Upper Tattoos" tool_tip="Clique para escolher um desenho"/>
+			<texture_picker width="86" label="Tattoo: inferior" name="Lower Tattoos" tool_tip="Clique para escolher um desenho"/>
+			<button label="Criar Nova Pele" label_selected="Criar Nova Pele" name="Create New"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+		</panel>
+		<panel label="Cabelo" name="Hair">
+			<button width="115" label="Cor" label_selected="Cor" name="Color"/>
+			<button width="115" label="Estilo" label_selected="Estilo" name="Style"/>
+			<button width="115" label="Sombrancelhas" label_selected="Sombrancelhas" name="Eyebrows"/>
+			<button width="115" label="Rosto" label_selected="Rosto" name="Facial"/>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: não foi possível modificar
+			</text>
+			<text name="title_loading">
+				[DESC]: carregando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: não vestido
+			</text>
+			<text name="path">
+				Localizado em [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponha um novo cabelo em seu avatar arrastando um do seu inventário.
+Alternativamente, você pode criar um novo modelo a partir de um esboço
+e usá-lo.
+			</text>
+			<text name="no modify instructions">
+				Você não ter permissão para modificar essa vestimenta.
+			</text>
+			<text name="Item Action Label">
+				Cabelo:
+			</text>
+			<texture_picker label="Texture" name="Texture" tool_tip="Clique para escolher uma imagem"/>
+			<button label="Criar Novo Cabelo" label_selected="Criar Novo Cabelo" name="Create New"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+		</panel>
+		<panel label="Olhos" name="Eyes">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: não foi possível modificar
+			</text>
+			<text name="title_loading">
+				[DESC]: carregando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: não vestido
+			</text>
+			<text name="path">
+				Localizado em [PATH]
+			</text>
+			<text name="not worn instructions">
+				Para colocar novos olhos, arraste um do seu inventário para seu avatar.
+Alternativamente, você pode criar um novo modelo de um esboço e usá-lo.
+			</text>
+			<text name="no modify instructions">
+				Você não tem permissão para alterar esta vestimenta.
+			</text>
+			<text name="Item Action Label">
+				Olhos:
+			</text>
+			<texture_picker label="Íris" name="Iris" tool_tip="Clique para escolher uma imagem"/>
+			<button label="Criar Novos Olhos" label_selected="Criar Novos Olhos" name="Create New"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+		</panel>
+		<panel label="Roupas" name="clothes_placeholder"/>
+		<panel label="Camisa" name="Shirt">
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+			<button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: não foi possível modificar
+			</text>
+			<text name="title_loading">
+				[DESC]: carregando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: não vestido
+			</text>
+			<text name="path">
+				Localizado em [PATH]
+			</text>
+			<text name="not worn instructions">
+				Para por uma nova camisa em seu avatar, arraste uma do seu inventário para
+seu avatar. Alternativamente, você pode criar um novo modelo a partir de
+um esboço e usá-lo.
+			</text>
+			<text name="no modify instructions">
+				Você não ter permissão para modificar esta vestimenta.
+			</text>
+			<text name="Item Action Label">
+				Camisa:
+			</text>
+		</panel>
+		<panel label="Calças" name="Pants">
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas."/>
+			<button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: não foi possível modificar
+			</text>
+			<text name="title_loading">
+				[DESC]: carregando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: não vestindo
+			</text>
+			<text name="path">
+				Localizado em [PATH]
+			</text>
+			<text name="not worn instructions">
+				Para por uma nova calça em seu avatar, basta arrastar uma outra do seu
+inventário. Alternativamente, você pode criar um novo modelo a partir
+de um esboço e usá-lo.
+			</text>
+			<text name="no modify instructions">
+				Você não tem permissão para modificar esta vestimenta.
+			</text>
+			<text name="Item Action Label">
+				Calças:
+			</text>
+		</panel>
+		<panel label="Sapatos" name="Shoes">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: não foi possível modificar
+			</text>
+			<text name="title_loading">
+				[DESC]: carregando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: não vestido
+			</text>
+			<text name="path">
+				Localizado em [PATH]
+			</text>
+			<text name="not worn instructions">
+				Para por novos sapatos em seu avatar, basta arrastar um novo do seu
+inventário. Alternativamente, você pode criar um novo modelo a partir
+de um esboço e usá-lo.
+			</text>
+			<text name="no modify instructions">
+				Você não tem permissão para modificar esta vestimenta.
+			</text>
+			<text name="Item Action Label">
+				Sapatos:
+			</text>
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+			<button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos" name="Create New" width="166"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+		</panel>
+		<panel label="Meias" name="Socks">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: não foi possível modificar
+			</text>
+			<text name="title_loading">
+				[DESC]: carregando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: não vestido.
+			</text>
+			<text name="path">
+				Localizado em [PATH]
+			</text>
+			<text name="not worn instructions">
+				Para por novas meias em seu avatar, basta arrastar uma nova do seu
+inventário. Alternativamente, você pode criar novas meias a partir de
+um esboço e usá-las.
+			</text>
+			<text name="no modify instructions">
+				Você não tem permissão para modificar essa vestimenta.
+			</text>
+			<text name="Item Action Label">
+				Meias:
+			</text>
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+			<button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+		</panel>
+		<panel label="Jaqueta" name="Jacket">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Não foi possível modificar
+			</text>
+			<text name="title_loading">
+				[DESC]: carregando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: não vestido
+			</text>
+			<text name="path">
+				Localizado em [PATH]
+			</text>
+			<text name="not worn instructions">
+				Para por uma nova jaqueta em seu avatar, basta arrastar um novo modelo
+do seu inventário. Alternativamente, você pode criar um novo modelo a
+partir de um esboço e usá-lo.
+			</text>
+			<text name="no modify instructions">
+				Você não tem permissão para modificar esta vestimenta.
+			</text>
+			<text name="Item Action Label">
+				Jaqueta:
+			</text>
+			<texture_picker label="Tecido Superior" name="Upper Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
+			<texture_picker label="Tecido Inferior" name="Lower Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+			<button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+		</panel>
+		<panel label="Luvas" name="Gloves">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: não foi possível modificar
+			</text>
+			<text name="title_loading">
+				[DESC]: carregando....
+			</text>
+			<text name="title_not_worn">
+				[DESC]: não vestido
+			</text>
+			<text name="path">
+				Localizado em [PATH]
+			</text>
+			<text name="not worn instructions">
+				Para colocar uma nova jaqueta em seu avatar, basta arrastar um novo modelo
+do seu inventário. Alternativamente, você pode criar uma novo modelo a
+partir de um esboço e usá-lo.
+			</text>
+			<text name="no modify instructions">
+				Você não tem permissão para modificar essa vestimenta.
+			</text>
+			<text name="Item Action Label">
+				Luvas:
+			</text>
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/>
+			<button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+		</panel>
+		<panel label="Camiseta" name="Undershirt">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: não foi possível modificar
+			</text>
+			<text name="title_loading">
+				[DESC]: carregando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: não vestido
+			</text>
+			<text name="path">
+				Localizado em [PATH]
+			</text>
+			<text name="not worn instructions">
+				Para por uma nova Camiseta em seu avatar, basta arrastar um novo modelo
+de seu inventário. Alternativamente, você pode criar um novo modelo a
+partir de um esboço e usá-lo.
+			</text>
+			<text name="no modify instructions">
+				Você não ter permissão para modificar essa vestimenta.
+			</text>
+			<text name="Item Action Label">
+				Camiseta:
+			</text>
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/>
+			<button label="Criar Nova Camiseta" label_selected="Criar Nova Camiseta" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+		</panel>
+		<panel label="Roupas de Baixo" name="Underpants">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: não foi possível modificar
+			</text>
+			<text name="title_loading">
+				[DESC]: carregando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: não vestido
+			</text>
+			<text name="path">
+				Localizado em [PATH]
+			</text>
+			<text name="not worn instructions">
+				Para por novas roupas de baixo em seu avatar, basta arrastar um novo
+modelo do seu inventário. Alternativamente, você pode criar um novo
+modelo a partir de um esboço e usá-lo.
+			</text>
+			<text name="no modify instructions">
+				Você não tem permissão para modificar essa vestimenta.
+			</text>
+			<text name="Item Action Label">
+				Roupas de Baixo:
+			</text>
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+			<button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New" width="180"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+		</panel>
+		<panel label="Saia" name="Skirt">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: não foi possível modificar
+			</text>
+			<text name="title_loading">
+				[DESC]: carregando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: não vestido
+			</text>
+			<text name="path">
+				Localizado em [PATH]
+			</text>
+			<text name="not worn instructions">
+				Para por uma nova saia em seu avatar, basta arrastar um novo modelo
+do seu inventário. Alternativamente, você pode criar um novo modelo a
+partir de um esboço e usá-lo.
+			</text>
+			<text name="no modify instructions">
+				Você não tem permissão para modificar esta vestimenta.
+			</text>
+			<text name="Item Action Label">
+				Saia:
+			</text>
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Click to open Color Picker"/>
+			<button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+		</panel>
+	</tab_container>
+	<scroll_container left="249" name="panel_container"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<button label="OK" label_selected="OK" name="Ok"/>
+	<button label="Criar Vestimenta..." label_selected="Criar Vestimenta..." name="Make Outfit" left="117" width="125" />
+</floater>

indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Day Cycle Floater" title="Editor de ciclo de dia">
+	<tab_container name="Day Cycle Tabs">
+		<panel label="Ciclo do dia" name="Day Cycle">
+			<button label="?" name="WLDayCycleHelp"/>
+			<text name="WL12am">
+				0:00
+			</text>
+			<text name="WL3am">
+				3:00
+			</text>
+			<text name="WL6am">
+				6:00
+			</text>
+			<text name="WL9amHash">
+				9:00
+			</text>
+			<text name="WL12pmHash">
+				12:00
+			</text>
+			<text name="WL3pm">
+				15:00
+			</text>
+			<text name="WL6pm">
+				18:00
+			</text>
+			<text name="WL9pm">
+				21:00
+			</text>
+			<text name="WL12am2">
+				24:00
+			</text>
+			<button font="SansSerifSmall" width="96" left="546" label="Adicionar chave" label_selected="Adicionar chave" name="WLAddKey"/>
+			<button font="SansSerifSmall" width="96" left="546" label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
+			<text name="WLCurKeyFrameText" width="190" left="17">
+				Configurações de Quadro-chave:
+			</text>
+			<text name="WLCurKeyTimeText">
+				Tempo-chave:
+			</text>
+			<spinner label="Hora" name="WLCurKeyHour"/>
+			<spinner label="Minutos" name="WLCurKeyMin"/>
+			<text name="WLCurKeyTimeText2">
+				Ajuste-chave:
+			</text>
+			<combo_box label="Ajuste" name="WLKeyPresets"/>
+			<text name="DayCycleText">
+				Grudar:
+			</text>
+			<combo_box label="5 minutos" name="WLSnapOptions" width="85"/>
+			<text name="DayCycleText2">
+				Duração do Ciclo:
+			</text>
+			<spinner label="Hora" name="WLLengthOfDayHour"/>
+			<spinner label="Minuto" name="WLLengthOfDayMin"/>
+			<spinner label="Segundo" name="WLLengthOfDaySec"/>
+			<text name="DayCycleText3">
+				Prévia:
+			</text>
+			<button label="Tocar" label_selected="Tocar" name="WLAnimSky"/>
+			<button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/>
+			<button width="175" font="SansSerifSmall" label="Usar o horário da Propriedade" label_selected="Ir para o horário da Propriedade" name="WLUseLindenTime"/>
+			<button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/>
+			<button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/>
+		</panel>
+	</tab_container>
+</floater>

indra/newview/skins/default/xui/pt/floater_device_settings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_device_settings" title="Ajustes do Dispositivo de Conversa por Voz"/>

indra/newview/skins/default/xui/pt/floater_directory.xml

@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="directory" title="Busca no Second Life">
+	<tab_container name="Directory Tabs">
+		<panel label="Todos" name="find_all_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Nada foi encontrado.
+			</string>
+			<text name="find" width="60">
+				Encontrar:
+			</text>
+			<line_editor label="Buscar" name="search_editor" tool_tip="Busca no Second Life" width="150" left_delta="66"/>
+			<button label="Buscar" name="search_btn"/>
+			<combo_box name="Category">
+				<combo_item name="AnyCategory">
+					Qualquer categoria
+				</combo_item>
+				<combo_item name="Events">
+					Eventos
+				</combo_item>
+				<combo_item name="Groups">
+					Grupos
+				</combo_item>
+				<combo_item name="People">
+					Pessoas
+				</combo_item>
+				<combo_item name="Places">
+					Lugares
+				</combo_item>
+				<combo_item name="Wiki">
+					Wiki
+				</combo_item>
+			</combo_box>
+			<check_box label="Conteúdo PG" name="incpg"/>
+			<check_box label="Conteúdo Mature" name="incmature"/>
+			<check_box label="Conteúdo Adult" name="incadult"/>
+			<button label="?" label_selected="?" name="?"/>
+			<string name="loading_text">
+				Carregando...
+			</string>
+			<string name="done_text">
+				Feito
+			</string>
+		</panel>
+		<panel label="Classificados" name="classified_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Nada foi encontrado.
+			</string>
+			<text name="find" width="63">
+				Encontrar:
+			</text>
+			<line_editor left="69" name="name" width="150"/>
+			<check_box label="Conteúdo PG" name="incpg"/>
+			<check_box label="Conteúdo Mature" name="incmature"/>
+			<check_box label="Conteúdo Adult" name="incadult"/>
+			<combo_box name="Category">
+				<combo_item name="AnyCategory">
+					Qualquer categoria
+				</combo_item>
+				<combo_item name="Shopping">
+					Shopping
+				</combo_item>
+				<combo_item name="LandRental">
+					Aluguél de Terras
+				</combo_item>
+				<combo_item name="PropertyRental">
+					Aluguél de Propriedades
+				</combo_item>
+				<combo_item name="SpecialAttraction">
+					Atração Especial
+				</combo_item>
+				<combo_item name="NewProducts">
+					Novos Produtos
+				</combo_item>
+				<combo_item name="Employment">
+					Emprego
+				</combo_item>
+				<combo_item name="Wanted">
+					Procura-se
+				</combo_item>
+				<combo_item name="Service">
+					Serviço
+				</combo_item>
+				<combo_item name="Personal">
+					Pessoal
+				</combo_item>
+			</combo_box>
+			<button label="Procura" label_selected="Procura" name="Browse"/>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<button label="Colocar Anúncio..." label_selected="Colocar Anúncio..." name="Place an Ad..."/>
+			<button label="Apagar" label_selected="Apagar" name="Delete"/>
+			<scroll_list name="results">
+				<column label="Nome" name="name"/>
+				<column label="Preço" name="price"/>
+			</scroll_list>
+			<button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;"/>
+			<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+		</panel>
+		<panel label="Eventos" name="events_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Nada foi encontrado.
+			</string>
+			<text name="text2" width="60">
+				Encontrar:
+			</text>
+			<line_editor left="69" name="event_search_text" width="150" />
+			<radio_group name="date_mode">
+				<radio_item name="current">
+					Em progresso e processando
+				</radio_item>
+				<radio_item name="date">
+					Data
+				</radio_item>
+			</radio_group>
+			<button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;" tool_tip="Voltar um dia"/>
+			<text name="date_text">
+				6/6
+			</text>
+			<button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;" tool_tip="Avançar um dia"/>
+			<button label="Hoje" label_selected="Hoje" name="Today" tool_tip="Exibir eventos de hoje"/>
+			<text name="text">
+				Categoria:
+			</text>
+			<combo_box name="category combo" width="178">
+				<combo_item name="All">
+					Qualquer categoria
+				</combo_item>
+				<combo_item name="Discussion">
+					Discussão
+				</combo_item>
+				<combo_item name="Sports">
+					Esportes
+				</combo_item>
+				<combo_item name="LiveMusic">
+					Música ao Vivo
+				</combo_item>
+				<combo_item name="Commercial">
+					Comercial
+				</combo_item>
+				<combo_item name="Nightlife/Entertainment">
+					Vida noturna/Entretenimento
+				</combo_item>
+				<combo_item name="Games/Contests">
+					Jogos/Campeonatos
+				</combo_item>
+				<combo_item name="Pageants">
+					Espetáculos
+				</combo_item>
+				<combo_item name="Education">
+					Educação
+				</combo_item>
+				<combo_item name="ArtsandCulture">
+					Arte e Cultura
+				</combo_item>
+				<combo_item name="Charity/SupportGroups">
+					Caridade/Grupos de Apoio
+				</combo_item>
+				<combo_item name="Miscellaneous">
+					Variados
+				</combo_item>
+			</combo_box>
+			<check_box label="Conteúdo PG" name="incpg"/>
+			<check_box label="Conteúdo Mature" name="incmature"/>
+			<check_box label="Conteúdo Adult" name="incadult"/>
+			<button label="Buscar" label_selected="Buscar" name="Search" tool_tip="Buscar"/>
+			<button label="Apagar" label_selected="Apagar" name="Delete"/>
+			<scroll_list name="results">
+				<column label="Nome" name="name"/>
+				<column label="Tempo (PDT)" name="date"/>
+				<column label="Tempo" name="time"/>
+			</scroll_list>
+			<button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;"/>
+			<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+		</panel>
+		<panel label="Mostruário" name="showcase_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Nada foi encontrado.
+			</string>
+			<button label="Voltar" name="back_btn"/>
+			<button label="Adiantar" name="forward_btn"/>
+			<string name="loading_text">
+				Carregando...
+			</string>
+			<string name="done_text">
+				Feito
+			</string>
+		</panel>
+		<panel label="Venda de Terrenos" name="land_sales_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Nada foi encontrado.
+			</string>
+			<string name="land_help_text">
+				Terra pode ser comprada direto por Linden dólares ([CURRENCY]) ou em leilão por ambos [CURRENCY] ou [REALCURRENCY].
+Para comprar direto, visite a terra e clique no nome do lugar, na barra de título.
+			</string>
+			<text name="find" width="60">
+				Encontrar:
+			</text>
+			<check_box left="440" label="Conteúdo PG" name="incpg"/>
+			<check_box left="440" label="Conteúdo Mature" name="incmature"/>
+			<check_box left="440" label="Conteúdo Adulto" name="incadult"/>
+			<combo_box name="type" width="148">
+				<combo_item name="AllTypes">
+					Todos os tipos
+				</combo_item>
+				<combo_item name="Auction">
+					Leilão
+				</combo_item>
+				<combo_item name="MainlandSales">
+					À venda - Mainland
+				</combo_item>
+				<combo_item name="EstateSales">
+					À venda - Propriedade
+				</combo_item>
+			</combo_box>
+			<check_box left="66" label="Preço &#8804; " name="pricecheck"/>
+			<text left="186" name="pricecheck_symbol">
+				[CURRENCY]
+			</text>
+			<check_box left="66" label="Área &#8805; " name="areacheck"/>
+			<text left="186" name="areacheck_symbol">
+				m²
+			</text>
+			<line_editor name="priceedit" left="132"/>
+			<line_editor name="areaedit" left="132"/>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<scroll_list name="results">
+				<column label="Nome" name="name"/>
+				<column label="Tipo" name="landtype" width="50"/>
+				<column label="Preço [CURRENCY]" name="price" width="70"/>
+				<column label="Área" name="area" width="50"/>
+				<column label="[CURRENCY]/m²" name="per_meter" width="65"/>
+			</scroll_list>
+			<button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;"/>
+			<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+		</panel>
+		<panel label="Lugares" name="places_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Nada foi encontrado.
+			</string>
+			<text name="find" width="60">
+				Encontrar:
+			</text>
+			<line_editor name="name" left="66" width="150"/>
+			<check_box label="Conteúdo PG" name="incpg"/>
+			<check_box label="Conteúdo Mature" name="incmature"/>
+			<check_box label="Conteúdo Adult" name="incadult"/>
+			<combo_box name="Category">
+				<combo_item name="AnyCategory">
+					Qualquer Categoria
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Localidade da Linden
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Artes &amp; Cultura
+				</combo_item>
+				<combo_item name="Business">
+					Negócios
+				</combo_item>
+				<combo_item name="Educational">
+					Educacional
+				</combo_item>
+				<combo_item name="Gaming">
+					Jogos
+				</combo_item>
+				<combo_item name="Hangout">
+					Recreação
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Amigável a Iniciantes
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parques &amp; Natureza
+				</combo_item>
+				<combo_item name="Residential">
+					Residencial
+				</combo_item>
+				<combo_item name="Shopping">
+					Shopping
+				</combo_item>
+				<combo_item name="Other">
+					Outros
+				</combo_item>
+			</combo_box>
+			<combo_box name="Category_Adult">
+				<combo_item name="AnyCategory">
+					Qualquer Categoria
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Local da Linden
+				</combo_item>
+				<combo_item name="Adult">
+					Adult
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Artes &amp; Cultura
+				</combo_item>
+				<combo_item name="Business">
+					Negócios
+				</combo_item>
+				<combo_item name="Educational">
+					Educacional
+				</combo_item>
+				<combo_item name="Gaming">
+					Jogos
+				</combo_item>
+				<combo_item name="Hangout">
+					Moradia
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Amigável a Novos Usuários
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parques &amp; Natureza
+				</combo_item>
+				<combo_item name="Residential">
+					Residencial
+				</combo_item>
+				<combo_item name="Shopping">
+					Shopping
+				</combo_item>
+				<combo_item name="Other">
+					Outro
+				</combo_item>
+			</combo_box>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<scroll_list name="results">
+				<column label="Nome" name="name"/>
+				<column label="Tráfego" name="dwell"/>
+			</scroll_list>
+			<button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;"/>
+			<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+		</panel>
+		<panel label="Pessoas" name="people_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Nada foi encontrado.
+			</string>
+			<text name="find" width="60">
+				Encontrar:
+			</text>
+			<line_editor name="name" left="66" width="150"/>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<scroll_list name="results" width="266">
+				<column label="Nome" name="name" width="214"/>
+			</scroll_list>
+			<button right="270" label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;"/>
+			<button right="184" label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+		</panel>
+		<panel label="Grupos" name="groups_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Nada foi encontrado.
+			</string>
+			<text name="find" width="60">
+				Encontrar:
+			</text>
+			<line_editor label="Buscar" name="search_editor" tool_tip="Busca no Second Life" left_delta="66" width="150"/>
+			<button label="Voltar" name="back_btn"/>
+			<button label="Adiantar" name="forward_btn"/>
+			<button label="Buscar" name="search_btn"/>
+			<check_box label="Conteúdo PG" name="incpg"/>
+			<check_box label="Conteúdo Mature" name="incmature"/>
+			<check_box label="Conteúdo Adult" name="incadult"/>
+			<string name="loading_text">
+				carregando...
+			</string>
+			<string name="done_text">
+				Feito
+			</string>
+		</panel>
+	</tab_container>
+	<panel left="285" name="Panel Avatar" width="495" />
+</floater>

indra/newview/skins/default/xui/pt/floater_env_settings.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="Editor do Ambiente">
+	<text name="EnvTimeText">
+		Hora do Dia
+	</text>
+	<text name="EnvTimeText2">
+		12:00 PM
+	</text>
+	<text name="EnvCloudText">
+		Cobertura de
+Nuvens
+	</text>
+	<text name="EnvWaterColorText">
+		Cor da água
+	</text>
+	<color_swatch label="" name="EnvWaterColor" tool_tip="Clique para abrir o Editor de cores"/>
+	<text name="EnvWaterFogText">
+		Névoa da
+água
+	</text>
+	<button bottom="-144" label="Usar hora da propriedade" name="EnvUseEstateTimeButton" width="155"/>
+	<button label="Céu Avançado" name="EnvAdvancedSkyButton" width="155" left="167"/>
+	<button label="Água Avançada" name="EnvAdvancedWaterButton" width="155" left="326"/>
+	<button label="?" name="EnvSettingsHelpButton"/>
+</floater>

indra/newview/skins/default/xui/pt/floater_font_test.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="contents" title="Teste de Fonte">
+	<text name="linea">
+		OverrideTest, deveria aparecer aqui como Times. (De default/xui/en-us)
+	</text>
+</floater>

indra/newview/skins/default/xui/pt/floater_gesture.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="gestures" title="Gestos Ativos">
+	<text name="help_label">
+		Clicar duas vezes no gesto para executar animações e sons.
+	</text>
+	<scroll_list name="gesture_list">
+		<column label="Acionar" name="trigger"/>
+		<column label="Chave" name="shortcut"/>
+		<column label="Nome" name="name"/>
+	</scroll_list>
+	<button label="Novo" name="new_gesture_btn"/>
+	<button label="Editar" name="edit_btn"/>
+	<button label="Executar" name="play_btn"/>
+	<button label="Parar" name="stop_btn"/>
+</floater>

indra/newview/skins/default/xui/pt/floater_god_tools.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="godtools floater" title="Ferramentas de Deus">
+	<tab_container name="GodTools Tabs">
+		<panel label="Grade" name="grid">
+			<button label="Desconectar todos os usuários" label_selected="Desconectar todos os usuários" name="Kick all users"/>
+			<button label="Limpar os cachês de visibilidade do mapa da região." label_selected="Limpar os cachês de visibilidade do mapa da região." name="Flush This Region&apos;s Map Visibility Caches"/>
+		</panel>
+		<panel label="Região" name="region">
+			<text name="Sim Name:">
+				Nome do Simulador:
+			</text>
+			<check_box label="Prelúdio" name="check prelude" tool_tip="Ajustar para tornar esta região um prelúdio."/>
+			<check_box label="Fixar Sol" name="check fixed sun" tool_tip="Fixa a posição do sol (como em Região/Estados) &gt; Terreno."/>
+			<check_box label="Redefinir Home no teletransporte" name="check reset home" tool_tip="Quando um residente se teletransporta, redefine sua home para a posição de destino."/>
+			<check_box label="Visível" name="check visible" tool_tip="Ajustar para fazer essa região visível para os não-deuses"/>
+			<check_box label="Dano" name="check damage" tool_tip="Ajustar para permitir dano nesta região"/>
+			<check_box label="Bloquear ratreamento do Tráfego" name="block dwell" tool_tip="Configure isto para fazer a região não computar o tráfego."/>
+			<check_box label="Bloquear Terraform" name="block terraform" tool_tip="Ajustar para desabilitar as pessoas a terraplanarem seus terrenos"/>
+			<check_box label="Sandbox" name="is sandbox" tool_tip="Alterar se esta região for uma sandbox."/>
+			<button label="Nivelar o terreno" label_selected="Nivelar o Terreno" name="Bake Terrain" tool_tip="Salva o terreno atual como padrão."/>
+			<button label="Reverter Terreno" label_selected="Reverter Terreno" name="Revert Terrain" tool_tip="Substituir o terreno atual pelo padrão."/>
+			<button label="Trocar Terreno" label_selected="Trocar Terreno" name="Swap Terrain" tool_tip="Trocar o terreno atual pelo padrão."/>
+			<text name="estate id">
+				ID da Propriedade:
+			</text>
+			<text name="parent id">
+				ID do Pai:
+			</text>
+			<line_editor name="parentestate" tool_tip="Esta é a propriedade pai para esta região"/>
+			<text name="Grid Pos: ">
+				Posição da Grade:
+			</text>
+			<line_editor name="gridposx" tool_tip="Esta é a  posição x da grade para esta região"/>
+			<line_editor name="gridposy" tool_tip="Esta é a posição y da grade para esta região"/>
+			<text name="Redirect to Grid: ">
+				Redirecionar para a Grade:
+			</text>
+			<text name="billable factor text">
+				Fator cobrança:
+			</text>
+			<text name="land cost text">
+				[CURRENCY] por metros quadrados
+			</text>
+			<button label="Atualizar" label_selected="Atualizar" name="Refresh" tool_tip="Clique aqui para atualizar a informação acima."/>
+			<button label="Aplicar" label_selected="Aplicar" name="Apply" tool_tip="Clique aqui para aplicar qualquer mudança acima"/>
+			<button label="Selecionar Região" label_selected="Selecionar Região" name="Select Region" tool_tip="Selecionar toda a região com a ferramenta de terreno"/>
+			<button label="Autosalvar Agora" label_selected="Autosalvar Agora" name="Autosave now" tool_tip="Salvar estado compactado para o diretório de gravação automática."/>
+		</panel>
+		<panel label="Objetos" name="objects">
+			<text name="Sim Name:">
+				Sim Nome:
+			</text>
+			<text name="region name">
+				Welsh
+			</text>
+			<check_box label="Desativar Scripts" name="disable scripts" tool_tip="Ajustar para desativar todos os scripts da região"/>
+			<check_box label="Desativar Colisões" name="disable collisions" tool_tip="Ajustar para desativar colisões de não-agentes nessa região"/>
+			<check_box label="Desativar Física" name="disable physics" tool_tip="Ajustar para desativar toda a física nessa região"/>
+			<button label="Aplicar" label_selected="Aplicar" name="Apply" tool_tip="Clique aqui para aplicar todas as alterações acima."/>
+			<button label="Ajustar Alvo" label_selected="Ajustar Alvo" name="Set Target" tool_tip="Configura o avatar alvo para deleção de objetos."/>
+			<text name="target_avatar_name">
+				(sem alvo)
+			</text>
+			<button label="Apagar objetos programados do alvo em outras terras" label_selected="Apagar objetos programados do alvo em outras terras" name="Delete Target&apos;s Scripted Objects On Others Land" tool_tip="Apagar todos os objetos programados possuídos pelo alvo nas terras fora do domínio do alvo. Objetos (sem cópia) irão retornar."/>
+			<button label="Apagar objetos programados do Alvo em qualquer terreno" label_selected="Apagar objetos programados do Alvo em qualquer terreno" name="Delete Target&apos;s Scripted Objects On *Any* Land" tool_tip="Apagar todos os objetos programados do alvo nesta região. Objetos (sem cópia) irão retornar."/>
+			<button label="Apagar *TODOS* os objetos do alvo" label_selected="Apagar *TODOS* os objetos do alvo" name="Delete *ALL* Of Target&apos;s Objects" tool_tip="Apagar todos os objetos possuídos pelo alvo nesta região. Objetos (sem cópia) objetos irão retornar."/>
+			<button label="Pegar os maiores colidentes" label_selected="Pegar os maiores colidentes" name="Get Top Colliders" tool_tip="Pega a lista de objetos que estão experimentando as chamadas mais freqüentes."/>
+			<button label="Pegar os scripts principais" label_selected="Pegar os scripts principais" name="Get Top Scripts" tool_tip="Pegar a lista de objetos programados com a maior duração em tempo de execução."/>
+			<button label="Informações de Scripts" label_selected="Informações de Scripts" name="Scripts digest" tool_tip="Pega uma lista de todos os scripts e o número de ocorrências de cada um."/>
+		</panel>
+		<panel label="Requisição" name="request">
+			<text name="Destination:">
+				Destino:
+			</text>
+			<combo_box name="destination">
+				<combo_item name="Selection">
+					Seleção
+				</combo_item>
+				<combo_item name="AgentRegion">
+					Região do Agente
+				</combo_item>
+			</combo_box>
+			<text name="Request:">
+				Requisição:
+			</text>
+			<combo_box name="request">
+				<combo_item name="colliders&lt;steps&gt;">
+					Passos de Colisão
+				</combo_item>
+				<combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
+					Contagem de scripts, padrão opcional
+				</combo_item>
+				<combo_item name="objects&lt;pattern&gt;">
+					Padrão de Objetos
+				</combo_item>
+				<combo_item name="rez&lt;asset_id&gt;">
+					rez &lt;asset_id&gt;
+				</combo_item>
+			</combo_box>
+			<text name="Parameter:">
+				Parametro:
+			</text>
+			<button label="Fazer Requisição" label_selected="Fazer Requisição" name="Make Request"/>
+		</panel>
+	</tab_container>
+</floater>

indra/newview/skins/default/xui/pt/floater_html.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="htmlfloater" title="">
+	<button label="Fechar" name="close_btn"/>
+	<button label="Voltar" name="back_btn"/>
+	<button label="Adiantar" name="forward_btn"/>
+	<button label="Ir" name="go_btn"/>
+	<string name="home_page_url">
+		http://www.secondlife.com
+	</string>
+	<string name="support_page_url">
+    http://wiki.secondlife.com/wiki/Knowledge_Base/pt
+  </string>
+</floater>

indra/newview/skins/default/xui/pt/floater_hud.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_hud" title="Tutorial"/>

indra/newview/skins/default/xui/pt/floater_im.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="im_floater" title="Mensagem Instantânea">
+	<string name="only_user_message">
+		Você é o único usuário desta sessão.
+	</string>
+	<string name="offline_message">
+		[FIRST] [LAST] está offline.
+	</string>
+	<string name="invite_message">
+		Clique no botão [BUTTON NAME] para aceitar/ conectar a este bate-papo em voz.
+	</string>
+	<string name="muted_message">
+		Você emudeceu este residente. Enviar uma mensagem vai automaticamente reativá-lo novamente.
+	</string>
+	<string name="generic_request_error">
+		Erro na requisição, por favor, tente novamente.
+	</string>
+	<string name="insufficient_perms_error">
+		Você não tem permissões suficientes.
+	</string>
+	<string name="session_does_not_exist_error">
+		A sessão deixou de existir
+	</string>
+	<string name="no_ability_error">
+		Você não possui esta habilidade.
+	</string>
+	<string name="not_a_mod_error">
+		Você não é um moderador de sessão.
+	</string>
+	<string name="muted_error">
+		Um moderador do grupo desabilitou seu bate-papo em texto.
+	</string>
+	<string name="add_session_event">
+		Não foi possível adicionar usuários na sessão de bate-papo com [RECIPIENT].
+	</string>
+	<string name="message_session_event">
+		Não foi possível enviar sua mensagem na sessão de bate- papo com [RECIPIENT].
+	</string>
+	<string name="removed_from_group">
+		Você foi removido do grupo.
+	</string>
+	<string name="close_on_no_ability">
+		Você não possui mais a habilidade de estar na sessão de bate-papo.
+	</string>
+</multi_floater>

indra/newview/skins/default/xui/pt/floater_image_preview.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Image Preview" title="">
+	<text name="name_label">
+		Nome:
+	</text>
+	<text name="description_label">
+		Descrição:
+	</text>
+	<text name="preview_label">
+		Prévia da
+imagem como:
+	</text>
+	<combo_box label="Tipo de Roupas" name="clothing_type_combo" left="100" width="186">
+		<combo_item name="Image">
+			Imagem
+		</combo_item>
+		<combo_item name="Hair">
+			Cabelo
+		</combo_item>
+		<combo_item name="FemaleHead">
+			Cabeça Feminina
+		</combo_item>
+		<combo_item name="FemaleUpperBody">
+			Parte Superior do Corpo Feminino
+		</combo_item>
+		<combo_item name="FemaleLowerBody">
+			Parte Inferior do Corpo Feminino
+		</combo_item>
+		<combo_item name="MaleHead">
+			Cabeça Masculina
+		</combo_item>
+		<combo_item name="MaleUpperBody">
+			Parte Superior do Corpo Masculino
+		</combo_item>
+		<combo_item name="MaleLowerBody">
+			Parte Inferiro do Corpo Masculino
+		</combo_item>
+		<combo_item name="Skirt">
+			Saia
+		</combo_item>
+		<combo_item name="SculptedPrim">
+			Primitiva Esculpida
+		</combo_item>
+	</combo_box>
+	<text name="bad_image_text">
+		Incapaz de ler a imagem.
+
+Tente salvar a imagem como 24 bit Targa (.tga).
+	</text>
+	<check_box label="Usar compressão com menor perda" name="lossless_check"/>
+	<button label="Cancelar" name="cancel_btn"/>
+	<button label="Upload (UPLOADFEE)" name="ok_btn"/>
+</floater>

indra/newview/skins/default/xui/pt/floater_inspect.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="inspect" title="Inspecionar Objeto" min_width="450">
+	<scroll_list name="object_list" tool_tip="Selecione um objeto nesta lista para destacá-lo in-world">
+		<column label="Nome do Objeto" name="object_name"/>
+		<column label="Proprietário" name="owner_name"/>
+		<column label="Criador" name="creator_name"/>
+		<column label="Data de Criação" name="creation_date"/>
+	</scroll_list>
+	<button width="185" label="Ver Perfil do Proprietário..." label_selected="" name="button owner" tool_tip="Veja o perfil do proprietário do objeto destacado"/>
+	<button width="165" left="205" label="Ver perfil do criador..." label_selected="" name="button creator" tool_tip="Veja o perfil do criador original do objeto destacado"/>
+</floater>

indra/newview/skins/default/xui/pt/floater_instant_message.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(desconhecido)" name="im_floater" title="(desconhecido)">
+	<string name="ringing">
+		Chamando...
+	</string>
+	<string name="answering">
+		Conectando...
+	</string>
+	<string name="connected">
+		Conectado, clique Finalizar Chamada para deixar em espera
+	</string>
+	<string name="hang_up">
+		Chamada encerrada
+	</string>
+	<string name="inventory_item_offered">
+		Oferecido um item de Inventário
+	</string>
+	<string name="voice_icon">
+		icn_voice-pvtfocus.tga
+	</string>
+	<string name="title_string">
+		Mensagem Instantânea com [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] está digitando...
+	</string>
+	<string name="session_start_string">
+		Iniciando uma sessão com [NAME]. Por favor, aguarde.
+	</string>
+	<string name="default_text_label">
+		Clique aqui para uma mensagem instantânea.
+	</string>
+	<string name="unavailable_text_label">
+		Conversa por texto não está disponível para esta chamada.
+	</string>
+	<button label="Perfil..." name="profile_callee_btn"/>
+	<button label="Chamar" name="start_call_btn"/>
+	<button label="Terminar Chamada" name="end_call_btn"/>
+	<panel name="speaker_controls">
+		<button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
+	</panel>
+	<line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor"/>
+	<button label="Enviar" name="send_btn"/>
+	<string name="live_help_dialog">
+		*** Bem Vindo a Solicitação de Ajuda *** 
+Por favor, cheque primeiro nossas páginas de ajuda, pressionando F1 ou acessando a Base de Conhecimento em 
+http://secondlife.com/knowledgebase/ . Se sua resposta não está ali, por favor entre com sua pergunta e aguarde que um Ajudante responda.
+-=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=-
+	</string>
+</floater>

indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(desconhecido)" name="im_floater" title="(desconhecido)">
+	<string name="ringing">
+		Juntar-se à Conversa por Voz...
+	</string>
+	<string name="connected">
+		Conectado, clique Encerrar Chamada para deixar em espera
+	</string>
+	<string name="hang_up">
+		Deixar a Conversa por Voz
+	</string>
+	<string name="voice_icon">
+		icn_voice-groupfocus.tga
+	</string>
+	<string name="title_string">
+		Mensagem Instantânea com [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] está digitando...
+	</string>
+	<string name="session_start_string">
+		Iniciando uma sessão com [NAME]. Por favor, aguarde.
+	</string>
+	<string name="default_text_label">
+		Clique aqui para mensagem instantânea.
+	</string>
+	<layout_stack name="panels">
+		<layout_panel name="im_contents_panel">
+			<button label="Chamar" name="start_call_btn" width="145"/>
+			<button label="Encerrar Chamada" name="end_call_btn" width="145" halign="right"/>
+			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Clique aqui para trocar uma lista de participantes ativos nesta sessão de MI."/>
+			<line_editor label="Clique aqui para mensagem instantânea" name="chat_editor"/>
+			<button label="Enviar" name="send_btn"/>
+		</layout_panel>
+	</layout_stack>
+	<string name="live_help_dialog">
+		*** Bem Vindo à Solicitação de Ajuda *** Por favor, verifique primeiro nossas páginas de Ajuda do Second Life pressionando F1 ou acessando a Base de Conhecimento em http://secondlife.com/knowledgebase/. Se suas respostas não estiverem ali, por favor entre com sua pergunta para iniciar e aguarde alguns minutos para que algum Ajudante responda.-=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=-
+	</string>
+</floater>

indra/newview/skins/default/xui/pt/floater_instant_message_group.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(unknown)" name="im_floater" title="(unknown)">
+	<string name="ringing">
+		Entrando em bate-papo de Voz...
+	</string>
+	<string name="connected">
+		Conectado, clique em Terminar Chamada para finalizar
+	</string>
+	<string name="hang_up">
+		Deixou o bate-papo de voz
+	</string>
+	<string name="voice_icon">
+		icn_voice-groupfocus.tga
+	</string>
+	<string name="title_string">
+		Mensagem Instantânea com [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] está digitando...
+	</string>
+	<string name="session_start_string">
+		Iniciando sessão com [NAME], por favor aguarde.
+	</string>
+	<string name="moderated_chat_label">
+		(Moderado: Vozes desligadas por default)
+	</string>
+	<string name="default_text_label">
+		Clique aqui para mensagem instantânea.
+	</string>
+	<string name="muted_text_label">
+		Sua conversa de texto foi desabilitada por um Moderador do Grupo.
+	</string>
+	<layout_stack name="panels">
+		<layout_panel name="im_contents_panel">
+			<button label="Informação do Grupo" name="group_info_btn" width="130"/>
+			<button label="Entrar numa chamada" left_delta="135" name="start_call_btn" width="160"/>
+			<button halign="center" label="Encerrar Chamada" name="end_call_btn" width="160"/>
+			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Clique aqui para alternar a lista dos participantes ativos nesta sessão de IM."/>
+			<button label="Enviar" name="send_btn"/>
+		</layout_panel>
+	</layout_stack>
+</floater>

indra/newview/skins/default/xui/pt/floater_inventory.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Inventory" title="Inventário">
+	<search_editor label="Escreva aqui para busca" name="inventory search editor"/>
+	<tab_container name="inventory filter tabs">
+		<inventory_panel label="Todos os Itens" name="All Items"/>
+		<inventory_panel label="Itens Recentes" name="Recent Items"/>
+	</tab_container>
+	<menu_bar name="Inventory Menu">
+		<menu label="Arquivo" name="File">
+			<menu_item_call label="Abrir" name="Open"/>
+			<menu_item_call label="Nova Janela" name="New Window"/>
+			<menu_item_call label="Mostrar Filtros" name="Show Filters"/>
+			<menu_item_call label="Redefinir Filtros" name="Reset Current"/>
+			<menu_item_call label="Fechar Todas as Pastas" name="Close All Folders"/>
+			<menu_item_call label="Limpar Lixeira" name="Empty Trash"/>
+		</menu>
+		<menu label="Criar" name="Create">
+			<menu_item_call label="Nova Pasta" name="New Folder"/>
+			<menu_item_call label="Novo Script" name="New Script"/>
+			<menu_item_call label="Nova Nota" name="New Note"/>
+			<menu_item_call label="Novo Gesto" name="New Gesture"/>
+			<menu label="Nova Roupa" name="New Clothes">
+				<menu_item_call label="Nova Camisa" name="New Shirt"/>
+				<menu_item_call label="Nova Calça" name="New Pants"/>
+				<menu_item_call label="Novos Sapatos" name="New Shoes"/>
+				<menu_item_call label="Novas Meias" name="New Socks"/>
+				<menu_item_call label="Nova Jaqueta" name="New Jacket"/>
+				<menu_item_call label="Nova Saia" name="New Skirt"/>
+				<menu_item_call label="Novas Luvas" name="New Gloves"/>
+				<menu_item_call label="Nova Anágua" name="New Undershirt"/>
+				<menu_item_call label="Novas Roupas de Baixo" name="New Underpants"/>
+			</menu>
+			<menu label="Parte do corpo" name="New Body Parts">
+				<menu_item_call label="Nova Forma" name="New Shape"/>
+				<menu_item_call label="Nova Pele" name="New Skin"/>
+				<menu_item_call label="Novo Cabelo" name="New Hair"/>
+				<menu_item_call label="Novos Olhos" name="New Eyes"/>
+			</menu>
+		</menu>
+		<menu label="Ordenar" name="Sort">
+			<menu_item_check label="Por Nome" name="By Name"/>
+			<menu_item_check label="Por Data" name="By Date"/>
+			<menu_item_check label="Pastas Sempre por Nome" name="Folders Always By Name"/>
+			<menu_item_check label="Pastas do sistema primeiro" name="System Folders To Top"/>
+		</menu>
+	</menu_bar>
+</floater>

indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="item properties" title="Propriedades do Item de Inventário">
+	<text name="LabelItemNameTitle">
+		Nome:
+	</text>
+	<text name="LabelItemDescTitle">
+		Descrição:
+	</text>
+	<text name="LabelCreatorTitle">
+		Criador:
+	</text>
+	<text name="LabelCreatorName">
+		Nicole Linden
+	</text>
+	<button label="Perfil..." label_selected="" name="BtnCreator"/>
+	<text name="LabelOwnerTitle">
+		Dono:
+	</text>
+	<text name="LabelOwnerName">
+		Thrax Linden
+	</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ê pode:
+	</text>
+	<check_box label="Modificar" name="CheckOwnerModify"/>
+	<check_box label="Copiar" name="CheckOwnerCopy"/>
+	<check_box label="Revender/Doar" name="CheckOwnerTransfer"/>
+	<text name="BaseMaskDebug">
+		B:
+	</text>
+	<text name="OwnerMaskDebug">
+		O:
+	</text>
+	<text name="GroupMaskDebug">
+		G:
+	</text>
+	<text name="EveryoneMaskDebug">
+		E:
+	</text>
+	<text name="NextMaskDebug">
+		N:
+	</text>
+	<check_box label="Compartilhar com o grupo" name="CheckShareWithGroup"/>
+	<check_box label="Permitir qualquer um copiar" name="CheckEveryoneCopy"/>
+	<text name="NextOwnerLabel" width="230">
+		Próximo dono pode:
+	</text>
+	<check_box label="Modificar" name="CheckNextOwnerModify"/>
+	<check_box label="Copiar" name="CheckNextOwnerCopy"/>
+	<check_box label="Revender/Doar" name="CheckNextOwnerTransfer"/>
+	<text name="SaleLabel">
+		Marcar Item:
+	</text>
+	<check_box label="À venda" name="CheckPurchase"/>
+	<radio_group name="RadioSaleType">
+		<radio_item name="radio">
+			Original
+		</radio_item>
+		<radio_item name="radio2">
+			Cópia
+		</radio_item>
+	</radio_group>
+	<text name="TextPrice">
+		Price:  [CURRENCY]
+	</text>
+	<string name="unknown">
+		(desconhecido)
+	</string>
+	<string name="public">
+		(público)
+	</string>
+	<string name="you_can">
+		Você pode:
+	</string>
+	<string name="owner_can">
+		Proprietário pode :
+	</string>
+</floater>

indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Inventory Finder" title="itens_de_inventário_recentes" width="165">
+	<check_box label="Animação" name="check_animation"/>
+	<check_box label="Cartões de chamadas" name="check_calling_card"/>
+	<check_box label="Roupas" name="check_clothing"/>
+	<check_box label="Gestos" name="check_gesture"/>
+	<check_box label="Landmarks" name="check_landmark"/>
+	<check_box label="Anotações" name="check_notecard"/>
+	<check_box label="Objetos" name="check_object"/>
+	<check_box label="Scripts" name="check_script"/>
+	<check_box label="Sons" name="check_sound"/>
+	<check_box label="Texturas" name="check_texture"/>
+	<check_box label="Fotos" name="check_snapshot"/>
+	<button label="Tudo" label_selected="Tudo" name="All"/>
+	<button label="Nenhum" label_selected="Nenhum" name="None"/>
+	<check_box label="Sempre mostrar as pastas" name="check_show_empty" left="3"/>
+	<check_box label="Desde o Logoff" name="check_since_logoff" left="3"/>
+	<text name="- OR -">
+		- OU -
+	</text>
+	<spinner label="Horas Atrás" name="spin_hours_ago"/>
+	<spinner label="Dias Atrás" name="spin_days_ago"/>
+	<button label="Fechar" label_selected="Fechar" name="Close"/>
+</floater>

indra/newview/skins/default/xui/pt/floater_joystick.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Joystick" title="Configuração do Joystick">
+	<check_box name="enable_joystick">
+		Habilitar Joystick:
+	</check_box>
+	<text left="135" name="joystick_type" width="360"/>
+	<spinner label="Mapeamento: eixo X" name="JoystickAxis1" label_width="124" width="164"/>
+	<spinner label="Mapeamento: eixo Y" name="JoystickAxis2" label_width="124" width="164"/>
+	<spinner label="Mapeamento: eixo Z" name="JoystickAxis0" label_width="124" width="164"/>
+	<spinner label="Mapeamento: Elevação" name="JoystickAxis4" label_width="124" width="164"/>
+	<spinner label="Mapeamento: Guinada" name="JoystickAxis5" label_width="124" width="164"/>
+	<spinner label="Mapeamento: Rolagem" name="JoystickAxis3" label_width="124" width="164"/>
+	<spinner label="Mapeamento: Zoom" name="JoystickAxis6" label_width="124" width="164"/>
+	<check_box label="Zoom Direto" name="ZoomDirect" left="194"/>
+	<check_box label="Cursor 3D" name="Cursor3D"/>
+	<check_box label="Nível Automático" name="AutoLeveling"/>
+	<text name="Control Modes:">
+		Modos de Controle:
+	</text>
+	<check_box name="JoystickAvatarEnabled">
+		Avatar
+	</check_box>
+	<check_box name="JoystickBuildEnabled" left="192">
+		Construir
+	</check_box>
+	<check_box name="JoystickFlycamEnabled">
+		Camera aérea
+	</check_box>
+	<text name="XScale">
+		Escala X
+	</text>
+	<text name="YScale">
+		Escala Y
+	</text>
+	<text name="ZScale">
+		Escala Z
+	</text>
+	<text name="PitchScale" left="3" width="115">
+		Escala de Elevação
+	</text>
+	<text name="YawScale" left="3" width="115">
+		Escala da Guinada
+	</text>
+	<text name="RollScale" left="3" width="115">
+		Escala de Rolagem
+	</text>
+	<text name="XDeadZone">
+		Zona Morta X
+	</text>
+	<text name="YDeadZone">
+		Zona Morta Y
+	</text>
+	<text name="ZDeadZone">
+		Zona Morta Z
+	</text>
+	<text name="PitchDeadZone" left="3" width="115">
+		Zona Morta: Elevação
+	</text>
+	<text name="YawDeadZone" left="3" width="115">
+		Zona Morta: Guinada
+	</text>
+	<text name="RollDeadZone" left="3" width="115">
+		Zona Morta: Rolagem
+	</text>
+	<text name="Feathering">
+		Alisar
+	</text>
+	<text name="ZoomScale2">
+		Escala de Zoom
+	</text>
+	<text name="ZoomDeadZone" width="110" left="4">
+		Zona Morta de Zoom
+	</text>
+	<button label="Padrões do SpaceNavigator" name="SpaceNavigatorDefaults" font="SansSerifSmall"/>
+	<button label="OK" label_selected="OK" name="ok_btn"/>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<string name="JoystickMonitor">
+		Monitor do Joystick
+	</string>
+	<string name="Axis">
+		Eixo [NUM]
+	</string>
+	<string name="NoDevice">
+		nenhum dispositivo detectado
+	</string>
+</floater>

indra/newview/skins/default/xui/pt/floater_lagmeter.xml

@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_lagmeter" title="Medidor de Atraso">
+	<button label="" label_selected="" name="client_lagmeter" tool_tip="Status de atraso no Cliente"/>
+	<text left="30" name="client_lag_cause" right="-10" />
+	<text left="30" name="network_lag_cause" right="-10" />
+	<text left="30" name="server_lag_cause" right="-32" />
+	<text name="client">
+		Cliente:
+	</text>
+	<text name="client_text" font="SansSerifSmall">
+		Normal
+	</text>
+	<button label="" label_selected="" name="network_lagmeter" tool_tip="Status de atraso na rede"/>
+	<text name="network">
+		Rede:
+	</text>
+	<text name="network_text" font="SansSerifSmall">
+		Normal
+	</text>
+	<button label="" label_selected="" name="server_lagmeter" tool_tip="Status de atraso no servidor"/>
+	<text name="server">
+		Servidor:
+	</text>
+	<text name="server_text" font="SansSerifSmall">
+		Normal
+	</text>
+	<button label="?" name="server_help"/>
+	<button label="&gt;&gt;" name="minimize"/>
+	<string name="max_title_msg">
+		Medidor de Atraso
+	</string>
+	<string name="max_width_px">
+		360
+	</string>
+	<string name="min_title_msg">
+		Atraso
+	</string>
+	<string name="min_width_px">
+		90
+	</string>
+	<string name="client_text_msg">
+		Cliente
+	</string>
+	<string name="client_frame_rate_critical_fps">
+		10
+	</string>
+	<string name="client_frame_rate_warning_fps">
+		15
+	</string>
+	<string name="client_frame_time_window_bg_msg">
+		Normal, janela por baixo
+	</string>
+	<string name="client_frame_time_critical_msg">
+		Taxa de quadros do Cliente abaixo de [CLIENT_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="client_frame_time_warning_msg">
+		Taxa de quadros do Cliente entre [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
+	</string>
+	<string name="client_frame_time_normal_msg">
+		Normal
+	</string>
+	<string name="client_draw_distance_cause_msg">
+		Causa possível: Distância de desenho ajustada muito alta
+	</string>
+	<string name="client_texture_loading_cause_msg">
+		Causa possível: Carregamento de Imagens
+	</string>
+	<string name="client_texture_memory_cause_msg">
+		Causa possível: Muitas imagens na memória
+	</string>
+	<string name="client_complex_objects_cause_msg">
+		Causa possível: Muitos objetos complexos na cena
+	</string>
+	<string name="network_text_msg">
+		Rede
+	</string>
+	<string name="network_packet_loss_critical_pct">
+		10
+	</string>
+	<string name="network_packet_loss_warning_pct">
+		5
+	</string>
+	<string name="network_packet_loss_critical_msg">
+		Conexão está caindo para cerca de [NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
+	</string>
+	<string name="network_packet_loss_warning_msg">
+		Conexão está caindo [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
+	</string>
+	<string name="network_performance_normal_msg">
+		Normal
+	</string>
+	<string name="network_ping_critical_ms">
+		600
+	</string>
+	<string name="network_ping_warning_ms">
+		300
+	</string>
+	<string name="network_ping_critical_msg">
+		Tempo de conexão de ping é cerca de  [NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_ping_warning_msg">
+		Tempo de conexão de ping é [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_packet_loss_cause_msg">
+		Possível conexão ruim ou 'Largura de Banda' escolhida muito alta.
+	</string>
+	<string name="network_ping_cause_msg">
+		Possível conexão ruim ou aplicativos compartilhando arquivos.
+	</string>
+	<string name="server_text_msg">
+		Servidor
+	</string>
+	<string name="server_frame_rate_critical_fps">
+		20
+	</string>
+	<string name="server_frame_rate_warning_fps">
+		30
+	</string>
+	<string name="server_single_process_max_time_ms">
+		20
+	</string>
+	<string name="server_frame_time_critical_msg">
+		Taxa de quadros abaixo de [SERVER_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="server_frame_time_warning_msg">
+		Taxa de quadros entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
+	</string>
+	<string name="server_frame_time_normal_msg">
+		Normal
+	</string>
+	<string name="server_physics_cause_msg">
+		Causa possível: Muitos objetos físicos
+	</string>
+	<string name="server_scripts_cause_msg">
+		Causa possível: Muitos objetos com scripts
+	</string>
+	<string name="server_net_cause_msg">
+		Causa possível: Muito tráfego na rede
+	</string>
+	<string name="server_agent_cause_msg">
+		Causa possível: Muitas pessoas se movendo na região
+	</string>
+	<string name="server_images_cause_msg">
+		Causa possível: Muitos cálculos de imagem
+	</string>
+	<string name="server_generic_cause_msg">
+		Causa possível: Carga no simulador muito pesada
+	</string>
+	<string name="smaller_label">
+		&gt;&gt;
+	</string>
+	<string name="bigger_label">
+		&lt;&lt;
+	</string>
+</floater>

indra/newview/skins/default/xui/pt/floater_land_holdings.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="land holdings floater" title="Meu terreno">
+	<scroll_list name="parcel list">
+		<column label="Nome do Lote" name="name"/>
+		<column label="Região" name="location"/>
+		<column label="Tipo" name="type"/>
+		<column label="Área" name="area"/>
+	</scroll_list>
+	<button label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para o centro do terreno."/>
+	<button width="130" label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map" tool_tip="Mostrar esse terreno no mapa do mundo."/>
+	<text name="contrib_label">
+		Contribuições para os seus grupos:
+	</text>
+	<scroll_list name="grant list">
+		<column label="Grupo" name="group"/>
+		<column label="Área" name="area"/>
+	</scroll_list>
+	<text name="allowed_label" width="380">
+		Propriedades de terreno permitidas com o plano de pagamento atual:
+	</text>
+	<text name="allowed_text" left_delta="390">
+		[AREA] m²
+	</text>
+	<text name="current_label">
+		Propriedades de terrenos atuais:
+	</text>
+	<text name="current_text" left_delta="390">
+		[AREA] m²
+	</text>
+	<text name="available_label">
+		Disponível para compra de terras:
+	</text>
+	<text name="available_text" left_delta="390">
+		[AREA] m²
+	</text>
+	<string name="area_string">
+		[AREA] m²
+	</string>
+</floater>