[XP Tools] Further UI beautification

Refix all the panels that weren't good enough.
Fix settingss and default rects
Remove unused
Fix toolbar prefs floater
Use text editors for "URLs" we can't control, they resolve nicer anyway
Fix Texture Ctrl on profile not popping out on click
Fix Maturity string on profile not displaying
Also update about floater credits according to modern data.

indra/newview/app_settings/settings.xml

@@ -7500,6 +7500,22 @@ This should be as low as possible, but too low may break functionality</string>
         <integer>0</integer>
       </array>
     </map>
+    <key>FloaterExperiencePickerRect</key>
+    <map>
+      <key>Comment</key>
+      <string>Rectangle for experience picker floater</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>300</integer>
+        <integer>600</integer>
+        <integer>800</integer>
+        <integer>700</integer>
+      </array>
+    </map>
     <key>FloaterExperienceProfileRect</key>
     <map>
       <key>Comment</key>
@@ -7510,9 +7526,9 @@ This should be as low as possible, but too low may break functionality</string>
       <string>Rect</string>
       <key>Value</key>
       <array>
-        <integer>16</integer>
+        <integer>377</integer>
         <integer>650</integer>
-        <integer>600</integer>
+        <integer>345</integer>
         <integer>128</integer>
       </array>
     </map>
@@ -7526,10 +7542,10 @@ This should be as low as possible, but too low may break functionality</string>
       <string>Rect</string>
       <key>Value</key>
       <array>
-        <integer>16</integer>
-        <integer>650</integer>
+        <integer>300</integer>
         <integer>600</integer>
-        <integer>128</integer>
+        <integer>700</integer>
+        <integer>700</integer>
       </array>
     </map>
     <key>FloaterFindRect2</key>
@@ -8289,7 +8305,7 @@ This should be as low as possible, but too low may break functionality</string>
       <array>
         <integer>0</integer>
         <integer>512</integer>
-        <integer>480</integer>
+        <integer>500</integer>
         <integer>0</integer>
       </array>
     </map>

indra/newview/app_settings/settings_ascent.xml

@@ -1633,17 +1633,6 @@ Changing this setting only affects new text.</string>
       <key>IsCOA</key>
       <integer>1</integer>
     </map>
-    <key>ToolbarVisibleExperiencePicker</key>
-    <map>
-      <key>Comment</key>
-      <string>Whether or not the button for the experience picker is on the toolbar</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <boolean>0</boolean>
-    </map>
     <key>ToolbarVisibleExperiences</key>
     <map>
       <key>Comment</key>

indra/newview/llfloaterexperienceprofile.cpp

@@ -192,25 +192,12 @@ BOOL LLFloaterExperienceProfile::postBuild()
 
     childSetCommitCallback(EDIT IMG_LOGO, boost::bind(&LLFloaterExperienceProfile::onFieldChanged, this), nullptr);
 
-	const LLColor4& link_color = gSavedSettings.getColor4("HTMLLinkColor");
-    if (auto market = getChild<LLTextBox>(TF_MRKT))
+    if (auto logo = findChild<LLTextureCtrl>(IMG_LOGO))
     {
-		market->setClickedCallback([market] { LLUrlAction::clickAction(market->getValue().asStringRef(), true); });
-		market->setColor(link_color);
-		market->setFontStyle(LLFontGL::UNDERLINE);
-    }
-
-    if (auto location = getChild<LLTextBox>(TF_SLURL))
-    {
-		location->setClickedCallback([=] { LLUrlAction::clickAction(mLocationSLURL, true); });
-		location->setColor(link_color);
-		location->setFontStyle(LLFontGL::UNDERLINE);
-    }
-
-    if (auto logo = findChild<LLTexturePicker>(IMG_LOGO))
-    {
-		void show_picture(const LLUUID& id, const std::string& name);
-        logo->setCommitCallback(boost::bind(show_picture, boost::bind(&LLTexturePicker::getImageAssetID, logo), "Experience Picture"));
+        void show_picture(const LLUUID& id, const std::string& name);
+        LLTextBox* name = getChild<LLTextBox>(TF_NAME);
+        std::function<void()> cb = [logo, name]() { show_picture(logo->getImageAssetID(), "Experience Picture: " + name->getText()); };
+        logo->setMouseUpCallback(boost::bind(cb));
     }
 
 	getChild<LLTextEditor>(EDIT TF_DESC)->setCommitOnFocusLost(TRUE);
@@ -286,32 +273,24 @@ void LLFloaterExperienceProfile::onClickForget()
 
 bool LLFloaterExperienceProfile::setMaturityString( U8 maturity, LLTextBox* child, LLComboBox* combo )
 {
-	/* Singu Note: Nope.
-	LLStyle::Params style;
+	//LLStyle::Params style; // Singu Note: Nope.
 	std::string access;
-	*/
 	if (maturity <= SIM_ACCESS_PG)
 	{
-		/* Singu Note: Nope.
-		style.image(LLUI::getUIImage(getString("maturity_icon_general")));
+		//style.image(LLUI::getUIImage(getString("maturity_icon_general"))); // Singu Note: Nope.
 		access = LLTrans::getString("SIM_ACCESS_PG");
-		*/
 		combo->setCurrentByIndex(2);
 	}
 	else if (maturity <= SIM_ACCESS_MATURE)
 	{
-		/* Singu Note: Nope.
-		style.image(LLUI::getUIImage(getString("maturity_icon_moderate")));
+		//style.image(LLUI::getUIImage(getString("maturity_icon_moderate"))); // Singu Note: Nope.
 		access = LLTrans::getString("SIM_ACCESS_MATURE");
-		*/
 		combo->setCurrentByIndex(1);
 	}
 	else if (maturity <= SIM_ACCESS_ADULT)
 	{
-		/* Singu Note: Nope.
-		style.image(LLUI::getUIImage(getString("maturity_icon_adult")));
+		//style.image(LLUI::getUIImage(getString("maturity_icon_adult"))); // Singu Note: Nope.
 		access = LLTrans::getString("SIM_ACCESS_ADULT");
-		*/
 		combo->setCurrentByIndex(0);
 	}
 	else
@@ -323,9 +302,8 @@ bool LLFloaterExperienceProfile::setMaturityString( U8 maturity, LLTextBox* chil
 	child->setText(LLStringUtil::null);
 
 	child->appendImageSegment(style);
-
-	child->appendText(access, false);
 	*/
+	child->setText(access);
 
 	return true;
 }
@@ -367,21 +345,21 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
 	edit_child->setText(value);
 
 	mLocationSLURL = experience[LLExperienceCache::SLURL].asString();
-	child = getChild<LLTextBox>(TF_SLURL);
+	edit_child = getChild<LLTextEditor>(TF_SLURL);
 	bool has_slurl = !mLocationSLURL.empty() && mLocationSLURL != "last";
 	locationPanel->setVisible(has_slurl);
 	if (has_slurl) mLocationSLURL = LLSLURL(mLocationSLURL).getSLURLString();
-	child->setText(mLocationSLURL);
+	edit_child->setText(mLocationSLURL);
 
 
-	child = getChild<LLTextBox>(EDIT TF_SLURL);
+	edit_child = getChild<LLTextEditor>(EDIT TF_SLURL);
 	if (has_slurl)
 	{
-		child->setText(mLocationSLURL);
+		edit_child->setText(mLocationSLURL);
 	}
 	else
 	{
-		child->setText(getString("empty_slurl"));
+		edit_child->setText(getString("empty_slurl"));
 	}
 
 	setMaturityString((U8)(experience[LLExperienceCache::MATURITY].asInteger()), getChild<LLTextBox>(TF_MATURITY), getChild<LLComboBox>(EDIT TF_MATURITY));
@@ -457,8 +435,8 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
 		{
 			value=data[TF_MRKT].asString();
 
-			child = getChild<LLTextBox>(TF_MRKT);
-			child->setText(value);
+			edit_child = getChild<LLTextEditor>(TF_MRKT);
+			edit_child->setText(value);
             if(!value.empty())
 			{
 				marketplacePanel->setVisible(TRUE);
@@ -719,7 +697,7 @@ void LLFloaterExperienceProfile::onClickLocation()
 	LLViewerRegion* region = gAgent.getRegion();
 	if (region)
 	{
-		LLTextBox* child = getChild<LLTextBox>(EDIT TF_SLURL);
+		auto child = getChild<LLTextEditor>(EDIT TF_SLURL);
 		mLocationSLURL = LLSLURL(region->getName(), gAgent.getPositionGlobal()).getSLURLString();
 		child->setText(mLocationSLURL);
 		onFieldChanged();
@@ -728,7 +706,7 @@ void LLFloaterExperienceProfile::onClickLocation()
 
 void LLFloaterExperienceProfile::onClickClear()
 {
-	LLTextBox* child = getChild<LLTextBox>(EDIT TF_SLURL);
+	auto child = getChild<LLTextEditor>(EDIT TF_SLURL);
 	mLocationSLURL.clear();
 	child->setText(getString("empty_slurl"));
 	onFieldChanged();
@@ -877,8 +855,7 @@ void LLFloaterExperienceProfile::onPickGroup()
 void LLFloaterExperienceProfile::setEditGroup( LLUUID group_id )
 {
 	LLTextBox* child = getChild<LLTextBox>(EDIT TF_GROUP);
-	std::string value = LLSLURL("group", group_id, "inspect").getSLURLString();
-	child->setText(value);
+	child->setValue(group_id);
 	mPackage[LLExperienceCache::GROUP_ID] = group_id;
 	onFieldChanged();
 }

indra/newview/llpanelexperiences.cpp

@@ -68,6 +68,7 @@ void addExperienceToList(const LLSD& experience, LLNameListCtrl* list)
 		return;
 
 	const auto& id = experience[LLExperienceCache::EXPERIENCE_ID];
+	list->removeNameItem(id); // Don't add the same item twice, this can happen
 	auto item = LLNameListCtrl::NameItem()
 		.name(experience[LLExperienceCache::NAME].asString())
 		.target(LLNameListItem::EXPERIENCE);

indra/newview/llviewermessage.cpp

@@ -7204,17 +7204,6 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
 
 void script_question_mute(const LLUUID& item_id, const std::string& object_name);
 
-bool unknown_script_question_cb(const LLSD& notification, const LLSD& response)
-{
-	// Only care if they muted the object here.
-	if ( response["Mute"] ) // mute
-	{
-		LLUUID task_id = notification["payload"]["task_id"].asUUID();
-		script_question_mute(task_id,notification["payload"]["object_name"].asString());
-	}
-	return false;
-}
-
 void experiencePermissionBlock(LLUUID experience, LLSD result)
 {
 	LLSD permission;
@@ -7332,8 +7321,7 @@ void script_question_mute(const LLUUID& task_id, const std::string& object_name)
 		bool matches(const LLNotificationPtr notification) const override
 		{
 			if (notification->getName() == "ScriptQuestionCaution"
-			|| notification->getName() == "ScriptQuestion"
-				|| notification->getName() == "UnknownScriptQuestion")
+                || notification->getName() == "ScriptQuestion")
 			{
 			return (notification->getPayload()["task_id"].asUUID() == blocked_id);
 			}
@@ -7351,7 +7339,6 @@ void script_question_mute(const LLUUID& task_id, const std::string& object_name)
 static LLNotificationFunctorRegistration script_question_cb_reg_1("ScriptQuestion", script_question_cb);
 static LLNotificationFunctorRegistration script_question_cb_reg_2("ScriptQuestionCaution", script_question_cb);
 static LLNotificationFunctorRegistration script_question_cb_reg_3("ScriptQuestionExperience", script_question_cb);
-static LLNotificationFunctorRegistration unknown_script_question_cb_reg("UnknownScriptQuestion", unknown_script_question_cb);
 
 void process_script_experience_details(const LLSD& experience_details, LLSD args, LLSD payload)
 {
@@ -7475,14 +7462,12 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 		args["QUESTIONS"] = script_question;
 
 		if (known_questions != questions)
-		{ // This is in addition to the normal dialog.
-			LLSD payload;
-			payload["task_id"] = taskid;
-			payload["item_id"] = itemid;
-			payload["object_name"] = object_name;
-
-			args["DOWNLOADURL"] = LLTrans::getString("ViewerDownloadURL");
-			LLNotificationsUtil::add("UnknownScriptQuestion", args, payload);
+		{
+			// This is in addition to the normal dialog.
+			// Viewer got a request for not supported/implemented permission 
+			LL_WARNS("Messaging") << "Object \"" << object_name << "\" requested " << script_question
+								<< " permission. Permission is unknown and can't be granted. Item id: " << itemid
+								<< " taskid:" << taskid << LL_ENDL;
 		}
 
 		if (known_questions)

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

@@ -12,8 +12,8 @@
     <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, Inusaito Kanya, Router Gray, Bittenbythedark and the Alchemy Viewer Team (specifically Sovereign Engineer),
-with contributions by Cinder Roxley, Damian Zhaoying, Fractured Crystal, Franxisco Romano, Fritigern Gothly, Henri Beauchamp, Kadah Coba, Kitty Barnett, Knolan Falconer, Latif Khalifa, McCabe Maxsted, Mika Pyon, Narv Czervik, nhede Core, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Sim Federal, Thickbrick Sleaford, Tigh MacFanatic, Wolfspirit Magic, Zauber Parecelsus and others.
+Singularity Viewer is developed and maintained by Siana Gearz, Shyotl Kuhr, Inusaito Kanya, Router Gray and the Alchemy Viewer Team (specifically Sovereign Engineer),
+with contributions by Bittenbythedark, Cinder Roxley, Damian Zhaoying, Fractured Crystal, Franxisco Romano, Fritigern Gothly, Henri Beauchamp, Kadah Coba, Kitty Barnett, Knolan Falconer, Latif Khalifa, McCabe Maxsted, Mika Pyon, Narv Czervik, nhede Core, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Sim Federal, Thickbrick Sleaford, Tigh MacFanatic, Torric Rodas, Wolfspirit Magic, Zauber Parecelsus and others.
 Singularity is maintained in joint effort with the Alchemy Viewer Project. Singularity was forked from 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_experience_search.xml

@@ -2,13 +2,15 @@
 <floater
   positioning="cascading"
   legacy_header_height="18"
+  can_close="true"
+  can_minimize="true"
   can_resize="true"
   height="350"
-  layout="topleft"
   min_height="200"
   min_width="400"
   name="experiencepicker"
   help_topic="experiencepicker"
+  rect_control="FloaterExperiencePickerRect"
   title="Choose Experience"
   width="350">
 </floater>

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

@@ -52,7 +52,6 @@
     width="348"
     name="tab_container">
     <panel
-      background_visible="true"
       follows="all"
       height="540"
       left="0"
@@ -106,13 +105,13 @@
                 name="grid_wide"/>
               <button
                 follows="top|right"
-                height="23"
+                height="20"
                 label="Edit"
                 name="edit_btn"
+                left="-99"
                 width="100"
                 visible="false"
-                bottom_delta="-46"
-                right="-14"/>
+                bottom_delta="-1"/>
             </layout_panel>
             <layout_panel
               follows="all"
@@ -145,10 +144,11 @@
               <text_editor
                 follows="left|top|right"
                 font="SansSerif"
-                enabled="false"
                 height="50"
                 left="10"
                 name="experience_description"
+                hide_scrollbar="true"
+                enabled="false"
                 bottom="-50"
                 value=""
                 width="305"
@@ -177,11 +177,11 @@
                 type="string"
                 length="1"
                 follows="left|top|right"
-                height="18"
+                height="16"
                 left_delta="77"
                 valign="center"
                 name="ContentRatingText"
-                bottom_delta="3"
+                bottom_delta="0"
                 width="188">
               </text>
             </layout_panel>
@@ -204,17 +204,22 @@
                 width="290">
                 Location:
               </text>
-              <text
+              <text_editor
                 type="string"
                 length="1"
                 follows="left|top|right"
-                height="18"
+                height="24"
+                bottom_delta="-20"
+                bg_readonly_color="clear"
+                hide_scrollbar="true"
+                hide_border="true"
+                enabled="false"
                 left="10"
                 valign="center"
                 use_ellipses="true"
                 name="LocationTextText"
                 width="288">
-              </text>
+              </text_editor>
             </layout_panel>
             <layout_panel
               follows="all"
@@ -234,17 +239,22 @@
                 width="290">
                 Marketplace store:
               </text>
-              <text
+              <text_editor
                 type="string"
                 length="1"
                 follows="left|top|right"
-                height="18"
+                bottom_delta="-20"
+                height="24"
+                bg_readonly_color="clear"
+                hide_scrollbar="true"
+                hide_border="true"
+                enabled="false"
                 left="10"
                 valign="center"
                 use_ellipses="true"
                 name="marketplace"
                 width="288">
-              </text>
+              </text_editor>
             </layout_panel>
             <layout_panel
               follows="left|top|right"
@@ -289,7 +299,7 @@
                 type="string"
                 length="1"
                 follows="left|top"
-                height="16"
+                height="18"
                 left="10"
                 name="Group"
                 width="75">
@@ -351,6 +361,7 @@
                 length="1"
                 follows="left|top|right"
                 height="16"
+                bottom_delta="-18"
                 left="10"
                 name="privileged"
                 visible="false"
@@ -363,7 +374,7 @@
                 label="Report Abuse"
                 name="report_btn"
                 width="94"
-                bottom_delta="-5"
+                bottom_delta="-22"
                 left="104"
                 enabled="true"/>
             </layout_panel>
@@ -372,28 +383,29 @@
       </scroll_container>
     </panel>
     <panel
-      background_visible="true"
       follows="all"
       height="540"
+      min_height="250"
       left="0"
-      top="0"
+      bottom="-540"
       width="348"
+      mouse_opaque="false"
       name="edit_panel_experience_info">
       <scroll_container
         follows="all"
-        height="520"
-        left="9"
+        height="530"
+        left="0"
         name="edit_xp_scroll"
-        opaque="true"
-        bottom_delta="-530"
-        width="330">
+        bottom="0"
+        width="348">
         <panel
           follows="top|left|right"
-          height="590"
+          height="550"
           left="0"
           name="edit_scrolling_panel"
-          top="0"
-          width="310">
+          bottom="-550"
+          width="315"
+          min_width="315">
           <texture_picker
             enabled="true"
             fallback_image="default_land_picture.j2c"
@@ -401,23 +413,24 @@
             height="197"
             left="10"
             name="edit_logo"
-            top="10"
+            bottom="-207"
             width="290" />
           <text
             follows="left|top|right"
             height="14"
+            bottom_delta="-4"
             left="10"
             name="edit_experience_title_label"
             use_ellipses="true"
             value="Name:"
-            right="-10"/>
+            width="305"/>
           <line_editor
             follows="left|top|right"
             height="19"
             left="10"
             name="edit_experience_title"
             max_length_bytes="63"
-            right="-10"/>
+            width="305"/>
           <text
             follows="left|top|right"
             height="14"
@@ -426,33 +439,37 @@
             name="edit_experience_desc_label"
             use_ellipses="true"
             value="Description:"
-            right="-10"/>
+            width="305"/>
           <text_editor
             follows="left|top|right"
             height="57"
-            left="11"
+            bottom_delta="-57"
+            left="10"
             name="edit_experience_description"
+            spellcheck="true"
             max_length="2048"
-            right="-11"
+            width="305"
+            hide_scrollbar="true"
             word_wrap="true"/>
           <button
             bottom_delta="-33"
-            left="10"
+            left="9"
             width="125"
             height="23"
             name="Group_btn"
-            label="Group"
+            label="Set Group"
             />
-          <text
+          <name_box
             type="string"
             length="1"
             follows="left|top|right"
             height="14"
             left_delta="135"
-            bottom_delta="-32"
+            bottom_delta="4"
             use_ellipses="true"
+            id_type="1"
             name="edit_GroupText"
-            right="-10" />
+            right="-1" />
           <text
             bottom_delta="-26"
             type="string"
@@ -465,14 +482,14 @@
             Rating:
           </text>
           <combo_box
-            follows="right|top"
+            follows="left|right|top"
             height="20"
             label="Moderate"
-            right="-10"
+            right="-1"
             bottom_delta="-1"
             tool_tip="Increasing the maturity rating on an experience will reset permission for all residents which have allowed the experience."
             name="edit_ContentRatingText"
-            width="105">
+            width="139">
             <combo_item
               label="Adult"
               name="Adult"
@@ -492,18 +509,22 @@
             follows="left|top"
             height="14"
             left="10"
-            bottom_delta="-24"
+            bottom_delta="-20"
             name="edit_Location"
             right="90">
             Location:
           </text>
-          <text
+          <text_editor
             type="string"
             length="1"
             follows="left|top|right"
-            height="14"
-            left_delta="85"
-            bottom_delta="-28"
+            height="24"
+            bg_readonly_color="clear"
+            hide_scrollbar="true"
+            hide_border="true"
+            enabled="false"
+            left_delta="80"
+            bottom_delta="-4"
             use_ellipses="true"
             name="edit_LocationTextText"
             right="-10" />
@@ -511,6 +532,7 @@
             left="10"
             width="125"
             height="23"
+            bottom_delta="-23"
             name="location_btn"
             label="Set to Current"
             />
@@ -518,7 +540,7 @@
             bottom_delta="0"
             height="23"
             follows="top|right"
-            right="-10"
+            right="-1"
             width="125"
             name="clear_btn"
             label="Clear Location"/>
@@ -527,7 +549,7 @@
             length="1"
             follows="left|top|right"
             height="14"
-            bottom_delta="-33"
+            bottom_delta="-18"
             left="10"
             right="-10">
             Marketplace store:
@@ -537,21 +559,23 @@
             length="1"
             follows="left|top|right"
             height="19"
+            bottom_delta="-20"
             left="10"
             max_length_bytes="255"
             valign="center"
             name="edit_marketplace"
-            right="-10"/>
+            right="-1"/>
           <check_box width="140"
                      height="21"
-                     left="10"
+                     bottom_delta="-26"
+                     left="8"
                      follows="top|left"
                      tool_tip=""
                      label="Enable Experience"
                      name="edit_enable_btn"/>
-          <check_box width="125"
+          <check_box width="140"
                      height="21"
-                     bottom_delta="-42"
+                     bottom_delta="0"
                      right="-10"
                      visible="false"
                      follows="top|left|right"
@@ -561,7 +585,7 @@
             follows="left|top|right"
             height="25"
             left="10"
-            bottom_delta="35"
+            bottom_delta="-25"
             name="changes"
             use_ellipses="true"
             word_wrap="true"
@@ -573,7 +597,7 @@
             label="Back"
             name="cancel_btn"
             width="125"
-            botttom_delta="38"
+            botttom_delta="-38"
             left="10"
             visible="true"/>
           <button
@@ -581,9 +605,9 @@
             height="23"
             label="Save"
             name="save_btn"
-            bottom_delta="-46"
+            bottom_delta="0"
             width="125"
-            right="-10"
+            right="-1"
             visible="true"/>
         </panel>
       </scroll_container>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" name="regioninfo" rect_control="FloaterRegionInfo"
-     title="Region/Estate">
+     title="Region/Estate" width="500">
 	<tab_container border="false" bottom="0" follows="left|right|top|bottom" left="1"
-	     name="region_panels" right="-1" tab_position="top" top="-20" />
+	     name="region_panels" right="-1" tab_position="top" top="-20" tab_width="0"/>
 </floater>

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

@@ -59,15 +59,14 @@
   <check_box bottom_delta="-20" label="Map" name="map_btn" follows="left|right" control_name="ToolbarVisibleWorldMap"/>
   <check_box bottom_delta="-20" label="Mini-Map" name="minimap_btn" follows="left|right" control_name="ToolbarVisibleMiniMap"/>
   <check_box bottom_delta="-20" label="Experiences" name="experiences_btn" follows="left|right" control_name="ToolbarVisibleExperiences"/>
-  <check_box bottom_delta="-20" label="Experience Search" name="experience_search_btn" follows="left|right" control_name="ToolbarVisibleExperiencePicker"/>
   <!-- [RLVa:LF] -->
   <check_box bottom_delta="-20" label="RLVa Restrictions" name="rlv_restrictions_btn" follows="left|right" control_name="ToolbarVisibleRLVRestrictions"/>
   <check_box bottom_delta="-20" label="RLVa Locks" name="rlv_locks_btn" follows="left|right" control_name="ToolbarVisibleRLVLocks"/>
   <check_box bottom_delta="-20" label="RLVa Strings" name="rlv_strings_btn" follows="left|right" control_name="ToolbarVisibleRLVStrings"/>
   <!-- [/RLVa:LF] -->
   <check_box bottom_delta="-20" label="Memory Leak" name="memleak_btn" follows="left|right" control_name="ToolbarVisibleMemLeak" visibility_control="QAMode"/>
-  <check_box bottom="-38" label="Message Log" name="message_log_btn" follows="left|right" control_name="ToolbarVisibleMessageLog" left_delta="160"/>
-  <check_box bottom_delta="-20" label="Statistics" name="stats_btn" follows="left|right" control_name="ToolbarVisibleStatBar"/>
+  <check_box bottom_delta="-20" label="Message Log" name="message_log_btn" follows="left|right" control_name="ToolbarVisibleMessageLog"/>
+  <check_box bottom="-38" label="Statistics" name="stats_btn" follows="left|right" control_name="ToolbarVisibleStatBar" left_delta="160"/>
   <check_box bottom_delta="-20" label="Notifications Console" name="notifications_console_btn" follows="left|right" control_name="ToolbarVisibleNotificationsConsole"/>
   <check_box bottom_delta="-20" label="Debug Console" name="debug_console_btn" follows="left|right" control_name="ToolbarVisibleDebugConsole"/>
   <check_box bottom_delta="-20" label="Region Console" name="region_console_btn" follows="left|right" control_name="ToolbarVisibleRegionDebugConsole"/>
@@ -82,8 +81,8 @@
   <check_box bottom_delta="-20" label="Make Outfit" name="make_outfit_btn" follows="left|right" control_name="ToolbarVisibleOutfit"/>
   <check_box bottom_delta="-20" label="Outfits" name="outfits_btn" follows="left|right" control_name="ToolbarVisibleInventoryOutfits"/>
   <check_box bottom_delta="-20" label="Favorites" name="favs_btn" follows="left|right" control_name="ToolbarVisibleInventoryFavs"/>
-  <check_box bottom="-38" label="Received Items" name="received_items_btn" follows="left|right" control_name="ToolbarVisibleInventoryReceivedItems" left_delta="160"/>
-  <check_box bottom_delta="-20" label="Marketplace Listings" name="marketplace_listings_btn" follows="left|right" control_name="ToolbarVisibleMarketplaceListings"/>
+  <check_box bottom_delta="-20" label="Received Items" name="received_items_btn" follows="left|right" control_name="ToolbarVisibleInventoryReceivedItems"/>
+  <check_box bottom="-38" label="Marketplace Listings" name="marketplace_listings_btn" follows="left|right" control_name="ToolbarVisibleMarketplaceListings" left_delta="160"/>
   <check_box bottom_delta="-20" label="Marketplace" name="marketplace_btn" follows="left|right" control_name="ToolbarVisibleMarketplace"/>
   <check_box bottom_delta="-20" label="Preferences" name="preferences_btn" follows="left|right" control_name="ToolbarVisiblePreferences"/>
   <check_box bottom_delta="-20" label="Joystick Config" name="joystick_btn" follows="left|right" control_name="ToolbarVisibleJoystick"/>

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

@@ -8129,7 +8129,7 @@ Other Key Experiences may be available.
    name="ScriptQuestionExperience"
    persist="false"
    type="notify">
-'[OBJECTNAME]', an object owned by '[NAME]', requests your participation in the [GRID_WIDE]experience:
+'[OBJECTNAME]', an object owned by '[NAME]', requests your participation in the [GRID_WIDE] experience:
 
 [EXPERIENCE]
 
@@ -8148,11 +8148,11 @@ Is this OK?
       <button
        index="3"
        name="BlockExperience"
-       text="Block Experience"/>
+       text="Never"/>
       <button
         index="2"
         name="Mute"
-        text="Block Object"/>
+        text="Mute"/>
       <button
        index="0"
        name="Yes"
@@ -8197,28 +8197,6 @@ Do not allow access if you do not fully understand why it wants access to your a
     </footer>
   </notification>
 
-  <notification
-   icon="notify.tga"
-   name="UnknownScriptQuestion"
-   persist="false"
-   type="notify">
-The runtime script permission requested by &apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, isn&apos;t recognized by the viewer and can&apos;t be granted.
-
-To grant this permission please update your viewer to the latest version.
-     <tag>confirm</tag>
-     <form name="form">
-        <button
-         default="true"
-         index="1"
-         name="Deny"
-         text="Ok"/>
-        <button
-         index="2"
-         name="Mute"
-         text="Block"/>
-     </form>
-  </notification>
-
   <notification
    icon="notify.tga"
    name="ScriptDialog"

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

@@ -5,8 +5,7 @@
   width="300"
   height="100"
   min_height="100"
-  follows="top|bottom|right|left"
-  border="true">
+  follows="all">
   <panel.string
     name="loading">
     loading...
@@ -43,20 +42,21 @@
       bottom_delta="0"
       follows="top|left">
    </text>
-  <scroll_list
+  <name_list
     draw_heading="false"
-    bottom_delta="-108"
+    top="-24"
     left="3"
     width="225"
-    height="100"
-    follows="top|left|right"
+    bottom="10"
+    follows="all"
+    menu_num="3"
     name="experience_list">
     <columns
       width="225"
       user_resize="false"
       name="experience_name"
       label="Name"/>
-  </scroll_list>
+  </name_list>
   <button
     follows="top|right"
     bottom="58"

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-  bottom="48"
+  top="18"
   mouse_opaque="false"
   left="0"
   width="350"
-  top="24"
+  height="330"
   label="Search"
   follows="all">
 
@@ -40,11 +40,10 @@
     follows="all"
     left="5"
     right="-3"
-    top="-20"
-    bottom="-28"
+    bottom="0"
+    height="330"
     name="search_panel">
     <text
-      bottom="20"
       left="0"
       follows="top|left|right"
       right="-1">
@@ -75,7 +74,7 @@
       height="20"
       label="Mature"
       name="maturity"
-      bottom_delta="-6"
+      bottom_delta="-7"
       width="180"
       right="-1">
       <combo_box.item
@@ -98,22 +97,22 @@
       draw_heading="true"
       left="-4"
       right="-1"
-      top="-40"
-      bottom="70"
+      top="-62"
+      bottom="42"
       follows="all"
       menu_num="3"
       multi_select="true"
       name="search_results">
-      <column
+      <columns
         halign="center"
         width="24"
         name="maturity"
         label=""/>
-      <column
+      <columns
         user_resize="true"
         name="experience_name"
         label="Name"/>
-      <column
+      <columns
         user_resize="true"
         name="owner"
         label="Owner"/>

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

@@ -6,7 +6,6 @@
   help_topic="panel_region_experience_tab"
   label="Experiences"
   name="Experiences"
-  layout="topleft"
   left="0"
   top="320"
   width="480">
@@ -17,11 +16,12 @@ Any Experience may be Trusted.
 Trusted Experiences have permission
 to run on this estate.
 
-Additionally, if the estate does not allow
-public access, Residents participating in
-any Trusted Experience may enter the
-estate and can remain as long as they
-are in the Experience.
+Additionally, if the estate does not
+allow public access, Residents
+participating in any
+Trusted Experience may enter the
+estate and can remain as long as
+they are in the Experience.
    </panel.string>
    <panel.string
       name="allowed_estate_text">
@@ -35,7 +35,7 @@ to run on this estate.
       name="blocked_estate_text">
 Only Grid-Wide Experiences
 may be Blocked.
-      
+
 Blocked Experiences may not run
 on this estate.
    </panel.string>
@@ -44,14 +44,19 @@ on this estate.
       Changes to settings on this tab will affect all regions in the estate.
    </panel.string>
    <panel.string
-      name="allowed_parcel_text">Only Experiences that are not Grid-Wide may be Allowed.
-      
-Allowed Experiences have permission to run on this parcel if they are not Blocked by the estate.
+     name="allowed_parcel_text">Only Experiences that are not
+Grid-Wide may be Allowed.
+
+Allowed Experiences have
+permission to run on this parcel
+if they are not Blocked by the estate.
    </panel.string>
    <panel.string
-      name="blocked_parcel_text">Only Grid-Wide Experiences may be Blocked.
-      
-Blocked Experiences may not run on this parcel.
+     name="blocked_parcel_text">Only Grid-Wide Experiences
+may be Blocked.
+
+Blocked Experiences may not
+run on this parcel.
    </panel.string>
    <panel.string
       name="parcel_caption">
@@ -61,7 +66,6 @@ Blocked Experiences may not run on this parcel.
       length="1"
       follows="left|top"
       height="32"
-      layout="topleft"
       left="10"
       name="experiences_help_text"
       bottom="-32"
@@ -69,7 +73,6 @@ Blocked Experiences may not run on this parcel.
   <layout_stack
     bottom_delta="-380"
     left="5"
-    layout="topleft"
     follows="all"
     right="-5"
     height="400"
@@ -77,7 +80,7 @@ Blocked Experiences may not run on this parcel.
     <layout_panel
       follows="all"
       height="100"
-      min_height="100"
+      min_height="150"
       width="530"
       visible="false"
       name="trusted_layout_panel">
@@ -88,7 +91,6 @@ Blocked Experiences may not run on this parcel.
              class="panel_experience_list_editor"
              filename="panel_experience_list_editor.xml" />
       <text
-        layout="topleft"
         name="trusted_text_help"
         length="1"
         bottom="-205"
@@ -101,20 +103,19 @@ Blocked Experiences may not run on this parcel.
     </layout_panel>
     <layout_panel
       height="100"
-      min_height="100"
+      min_height="150"
       follows="all"
       width="530">
       <panel
         width="330"
-	height="100"
+        height="100"
         name="panel_allowed"
         class="panel_experience_list_editor"
         filename="panel_experience_list_editor.xml"/>
       <text
-        layout="topleft"
         name="allowed_text_help"
         length="1"
-        bottom="-205"
+        bottom="-225"
         left_delta="335"
         width="200"
         height="200"
@@ -123,20 +124,20 @@ Blocked Experiences may not run on this parcel.
       </text>
     </layout_panel>
     <layout_panel
-      height="50"
-      min_height="50"
+      height="100"
+      min_height="150"
       follows="all"
       width="530">
       <panel
         width="330"
+        height="200"
         name="panel_blocked"
         class="panel_experience_list_editor"
         filename="panel_experience_list_editor.xml"/>
       <text
-        layout="topleft"
         name="blocked_text_help"
         length="1"
-        bottom="-205"
+        bottom="-225"
         left_delta="335"
         width="200"
         height="200"

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

@@ -150,11 +150,6 @@
         <button.commit_callback function="ShowFloater" parameter="experiences"/>
       </button>
     </layout_panel>
-    <layout_panel name="panelexperiencesearch" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleExperiencePicker">
-      <button sound_flags="0" bottom="0" height="24" label="Experience Search" image_overlay="icn_toolbar_experience_picker.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="experience_picker_btn" width="50" follows="left|right">
-        <button.commit_callback function="ShowFloater" parameter="experience_search"/>
-      </button>
-    </layout_panel>
     <layout_panel name="panel9" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleSearch">
       <button sound_flags="0" bottom="0" height="24" label="Search" image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="directory_btn" tool_tip="Search for places, events, people, and more.(Ctrl-F)" width="50" follows="left|right" control_name="ShowDirectory">
         <button.commit_callback function="ShowFloater" parameter="search"/>