Merge in Storm-1838

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

@@ -44,6 +44,10 @@
     <on_click function="List.OfferTeleport"/>
     <on_enable function="List.EnableAnySelected"/>
   </menu_item_call>
+  <menu_item_call label="Request Teleport" name="Request Teleport">
+    <on_click function="List.RequestTeleport"/>
+    <on_visible function="List.EnableSingleSelected"/>
+  </menu_item_call>
   <menu_item_separator/>
   <menu_item_call label="Mute/Unmute" name="Mute/Unmute">
     <on_click function="List.Mute"/>

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

@@ -275,6 +275,9 @@
 	     mouse_opaque="true" name="Offer Teleport..." width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="lure" />
 	</menu_item_call>
+	<menu_item_call label="Request Teleport..." name="Request Teleport...">
+		<on_click filter="" function="Inventory.DoToSelected" userdata="request_lure" />
+	</menu_item_call>
 	<menu_item_call bottom_delta="-18" height="18" label="Start Conference Chat" left="0"
 	     mouse_opaque="true" name="Conference Chat" width="128">
 		<on_click filter="" function="Inventory.BeginIMSession" userdata="selected" />

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

@@ -49,6 +49,10 @@
       <on_click function="Radar.TeleportTo"/>
       <on_enable function="List.EnableSingleSelected"/>
     </menu_item_call>
+    <menu_item_call label="Request Teleport" name="Request Teleport">
+      <on_click function="List.RequestTeleport"/>
+      <on_visible function="List.EnableSingleSelected"/>
+    </menu_item_call>
     <menu_item_call label="Track/Untrack" name="Track/Untrack">
       <on_click function="Radar.Track"/>
       <on_enable function="List.EnableSingleSelected"/>

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

@@ -3615,6 +3615,27 @@ Join me in [REGION]
     </form>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportRequestPrompt"
+   type="alertmodal">
+Request a teleport to [NAME] with the following message
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" type="text">
+
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
   <notification
    icon="alertmodal.tga"
    name="TooManyTeleportOffers"
@@ -6765,6 +6786,31 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
     </form>
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="TeleportRequest"
+   type="notify">
+[NAME] is requesting to be teleported to your location.
+[MESSAGE]
+
+Offer a teleport?
+    <tag>confirm</tag>
+    <form name="form">
+      <button
+       index="0"
+       name="Yes"
+       text="Yes"/>
+      <button
+       index="1"
+       name="No"
+       text="No"/>
+      <button
+       index="3"
+       name="Profile"
+       text="Profile"/>
+    </form>
+  </notification>
+
   <notification
    icon="notify.tga"
    name="GotoURL"

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

@@ -111,6 +111,7 @@ The following wildcards are available to enhance your autoresponses: #n for user
       <check_box control_name="AntiSpamScripts" height="16" label="Scripts" name="Scripts" bottom_delta="0" left_delta="120"/>
       <check_box control_name="AntiSpamTeleports" height="16" label="Teleport Offers" name="Teleport Offers" bottom_delta="0" left_delta="120"/>
       <check_box control_name="AntiSpamGroupNotices" height="16" label="Group Notices" name="Group Notices" bottom_delta="0" left_delta="120"/>
+      <check_box control_name="AntiSpamTeleportRequests" height="16" label="Teleport Requests" name="Teleport Requests" left="14" bottom_delta="-20"/>
       <check_box control_name="EnableGestureSounds" label="Enable Gesture Sounds" name="Enable Gesture Sounds" left="3" bottom_delta="-20"/>
     </panel>