Merge branch 'develop' of https://github.com/secondlife/viewer

# Conflicts:
#	indra/llui/llfloater.h
#	scripts/messages/message_template.msg.sha1

indra/llcommon/indra_constants.h

@@ -359,5 +359,7 @@ const U8 CLICK_ACTION_DISABLED = 8;
 const U8 CLICK_ACTION_IGNORE = 9;
 // DO NOT CHANGE THE SEQUENCE OF THIS LIST!!
 
+constexpr U32 BEACON_SHOW_MAP  = 0x0001;
+constexpr U32 BEACON_FOCUS_MAP = 0x0002;
 
 #endif

indra/llprimitive/object_flags.h

@@ -57,16 +57,16 @@ const U32   FLAGS_CAMERA_SOURCE        = (1U << 22);
 
 //const U32 FLAGS_UNUSED_001           = (1U << 23); // was FLAGS_CAST_SHADOWS
 
-//const U32 FLAGS_UNUSED_002           = (1U << 24);
+const U32   FLAGS_SERVER_AUTOPILOT     = (1U << 24); // Update was for an agent AND that agent is being autopiloted from the server
-//const U32 FLAGS_UNUSED_003           = (1U << 25);
+//const U32 FLAGS_UNUSED_002           = (1U << 25);
-//const U32 FLAGS_UNUSED_004           = (1U << 26);
+//const U32 FLAGS_UNUSED_003           = (1U << 26);
-//const U32 FLAGS_UNUSED_005           = (1U << 27);
+//const U32 FLAGS_UNUSED_004           = (1U << 27);
 
 const U32   FLAGS_OBJECT_OWNER_MODIFY  = (1U << 28);
 
 const U32   FLAGS_TEMPORARY_ON_REZ     = (1U << 29);
-//const U32 FLAGS_UNUSED_006           = (1U << 30); // was FLAGS_TEMPORARY
+//const U32 FLAGS_UNUSED_005           = (1U << 30); // was FLAGS_TEMPORARY
-//const U32 FLAGS_UNUSED_007           = (1U << 31); // was FLAGS_ZLIB_COMPRESSED
+//const U32 FLAGS_UNUSED_006           = (1U << 31); // was FLAGS_ZLIB_COMPRESSED
 
 const U32   FLAGS_LOCAL                = FLAGS_ANIM_SOURCE | FLAGS_CAMERA_SOURCE;
 const U32   FLAGS_WORLD                = FLAGS_USE_PHYSICS | FLAGS_PHANTOM | FLAGS_TEMPORARY_ON_REZ;

indra/llui/llfloater.h

@@ -394,6 +394,9 @@ public:
 
     bool            isPositioning(LLFloaterEnums::EOpenPositioning p) const { return (p == mPositioning); }
 
+    void            setAutoFocus(bool focus) { mAutoFocus = focus; } // whether to automatically take focus when opened
+    bool            getAutoFocus() const { return mAutoFocus; }
+
     // <COLOSI opensim multi-currency support>
     // update currency symbols in titles (if there) and force update of display
     void            updateCurrencySymbols() { mTitle.updateCurrencySymbols(); mShortTitle.updateCurrencySymbols(); applyTitle(); }
@@ -422,8 +425,6 @@ protected:
     void            setExpandedRect(const LLRect& rect) { mExpandedRect = rect; } // size when not minimized
     const LLRect&   getExpandedRect() const { return mExpandedRect; }
 
-    void            setAutoFocus(bool focus) { mAutoFocus = focus; } // whether to automatically take focus when opened
-    bool            getAutoFocus() const { return mAutoFocus; }
     LLDragHandle*   getDragHandle() const { return mDragHandle; }
 
     void            destroy(); // Don't call this directly.  You probably want to call closeFloater()

indra/newview/llfloaterworldmap.cpp

@@ -504,8 +504,11 @@ void LLFloaterWorldMap::onOpen(const LLSD& key)
         const LLUUID landmark_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK);
         LLInventoryModelBackgroundFetch::instance().start(landmark_folder_id);
 
-        mLocationEditor->setFocus( true);
+        if (hasFocus())
-        gFocusMgr.triggerFocusFlash();
+        {
+            mLocationEditor->setFocus( true);
+            gFocusMgr.triggerFocusFlash();
+        }
 
         buildAvatarIDList();
         buildLandmarkIDLists();

indra/newview/llviewermessage.cpp

@@ -8392,7 +8392,6 @@ void process_initiate_download(LLMessageSystem* msg, void**)
         (void**)new std::string(viewer_filename));
 }
 
-
 void process_script_teleport_request(LLMessageSystem* msg, void**)
 {
     if (!gSavedSettings.getBOOL("ScriptsCanShowUI")) return;
@@ -8406,6 +8405,11 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
     msg->getString("Data", "SimName", sim_name);
     msg->getVector3("Data", "SimPosition", pos);
     msg->getVector3("Data", "LookAt", look_at);
+    U32 flags = (BEACON_SHOW_MAP | BEACON_FOCUS_MAP);
+    if (msg->has("Options"))
+    {
+        msg->getU32("Options", "Flags", flags);
+    }
 
     LLFloaterWorldMap* instance = LLFloaterWorldMap::getInstance();
     if(instance)
@@ -8416,7 +8420,13 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
             << LL_ENDL;
 
         instance->trackURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]);
-        LLFloaterReg::showInstance("world_map", "center");
+        if (flags & BEACON_SHOW_MAP)
+        {
+            bool old_auto_focus = instance->getAutoFocus();
+            instance->setAutoFocus(flags & BEACON_FOCUS_MAP);
+            instance->openFloater("center");
+            instance->setAutoFocus(old_auto_focus);
+        }
     }
 
     // remove above two lines and replace with below line

indra/newview/llviewerobject.cpp

@@ -2417,6 +2417,12 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 
         // Set the rotation of the object followed by adjusting for the accumulated angular velocity (llSetTargetOmega)
         setRotation(new_rot * mAngularVelocityRot);
+        if ((mFlags & FLAGS_SERVER_AUTOPILOT) && asAvatar() && asAvatar()->isSelf())
+        {
+            gAgent.resetAxes();
+            gAgent.rotate(new_rot);
+            gAgentCamera.resetView();
+        }
         setChanged(ROTATED | SILHOUETTE);
     }
 

indra/newview/skins/default/xui/de/notifications.xml

@@ -4254,6 +4254,9 @@ Versuch abgebrochen.
 	<notification name="NowOwnObject">
 		Sie sind jetzt Eigentümer des Objekts [OBJECT_NAME]
 	</notification>
+	<notification name="NowOwnObjectInv">
+		Sie sind jetzt Eigentümer des Objekts [OBJECT_NAME] und es wurde Ihrem Inventar hinzugefügt.
+	</notification>
 	<notification name="CantRezOnLand">
 		Objekt kann nicht an [OBJECT_POS] gerezzt werden, da der Landeigentümer dies nicht zulässt.  Machen Sie den Landeigentümer mit dem Landwerkzeug ausfindig.
 	</notification>

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

@@ -11593,6 +11593,14 @@ You are now the owner of object [OBJECT_NAME]
 
   <notification
    icon="alertmodal.tga"
+   name="NowOwnObjectInv"
+   type="notify">
+   <tag>fail</tag>
+You are now the owner of object [OBJECT_NAME] and it has been placed in your inventory.
+  </notification>
+
+    <notification
+   icon="alertmodal.tga"
    name="CantRezOnLand"
    type="notify">
    <tag>fail</tag>

scripts/messages/message_template.msg

@@ -4373,14 +4373,18 @@ version 2.0
 // ScriptTeleportRequest
 // reliable
 {
-	ScriptTeleportRequest Low 195 Trusted Unencoded
+    ScriptTeleportRequest Low 195 Trusted Unencoded
-	{
+    {
-		Data	Single
+        Data	Single
-		{	ObjectName		Variable	1	}
+        {   ObjectName      Variable	1	}
-		{	SimName			Variable	1	}
+        {   SimName         Variable	1	}
-		{	SimPosition		LLVector3		}
+        {   SimPosition     LLVector3		}
-		{	LookAt			LLVector3		}
+        {   LookAt          LLVector3		}
-	}
+    }
+    {
+        Options Variable
+        {   Flags           U32 }
+    }
 }
 
 

scripts/messages/message_template.msg.sha1

@@ -1 +1 @@
-1a9a3717fde5d0fb3d5f688a1a3dab7fcc2aa308
+91e9b6acccc03f06506d3bc0d014ab05ef71eec1