Merge branch 'master' of /home/opensim/var/repo/opensim

4 files changed, 41 insertions, 21 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
index e68f9d0..2602050 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
@@ -58,6 +58,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
         private Scene m_scene;
         private IFriendsModule m_friendsModule;
         private IUserManagement m_userManagementModule;
+        private IPresenceService m_presenceService;
 
 //        private IAvatarFactoryModule m_avatarFactory;
         
@@ -99,8 +100,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
 
             m_friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
             m_userManagementModule = m_scene.RequestModuleInterface<IUserManagement>();
+            m_presenceService = m_scene.RequestModuleInterface<IPresenceService>();
 
-            if (m_friendsModule != null && m_userManagementModule != null)
+            if (m_friendsModule != null && m_userManagementModule != null && m_presenceService != null)
             {
                 m_scene.AddCommand(
                     "Friends", this, "friends show",
@@ -162,7 +164,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
 
             MainConsole.Instance.OutputFormat("Friends for {0} {1} {2}:", firstName, lastName, userId);
 
-            MainConsole.Instance.OutputFormat("UUID, Name, MyFlags, TheirFlags");
+            MainConsole.Instance.OutputFormat(
+                "{0,-36}  {1,-36}  {2,-7}  {3,7}  {4,10}", "UUID", "Name", "Status", "MyFlags", "TheirFlags");
 
             foreach (FriendInfo friend in friends)
             {
@@ -175,14 +178,22 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
 
                 UUID friendId;
                 string friendName;
+                string onlineText;
 
                 if (UUID.TryParse(friend.Friend, out friendId))
                     friendName = m_userManagementModule.GetUserName(friendId);
                 else
                     friendName = friend.Friend;
 
+                OpenSim.Services.Interfaces.PresenceInfo[] pi = m_presenceService.GetAgents(new string[] { friend.Friend });
+                if (pi.Length > 0)
+                    onlineText = "online";
+                else
+                    onlineText = "offline";
+
                 MainConsole.Instance.OutputFormat(
-                    "{0} {1} {2} {3}", friend.Friend, friendName, friend.MyFlags, friend.TheirFlags);
+                    "{0,-36}  {1,-36}  {2,-7}  {3,-7}  {4,-10}",
+                    friend.Friend, friendName, onlineText, friend.MyFlags, friend.TheirFlags);
             }
         }
     }
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index eda2aef..4949097 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -163,28 +163,37 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                     return;
                 }
                     
-                m_comms.RegisterScriptInvocation(this,"JsonCreateStore");
-                m_comms.RegisterScriptInvocation(this,"JsonDestroyStore");
+                try
+                {
+                    m_comms.RegisterScriptInvocation(this,"JsonCreateStore");
+                    m_comms.RegisterScriptInvocation(this,"JsonDestroyStore");
 
-                m_comms.RegisterScriptInvocation(this,"JsonReadNotecard");
-                m_comms.RegisterScriptInvocation(this,"JsonWriteNotecard");
+                    m_comms.RegisterScriptInvocation(this,"JsonReadNotecard");
+                    m_comms.RegisterScriptInvocation(this,"JsonWriteNotecard");
 
-                m_comms.RegisterScriptInvocation(this,"JsonTestPath");
-                m_comms.RegisterScriptInvocation(this,"JsonTestPathJson");
+                    m_comms.RegisterScriptInvocation(this,"JsonTestPath");
+                    m_comms.RegisterScriptInvocation(this,"JsonTestPathJson");
 
-                m_comms.RegisterScriptInvocation(this,"JsonGetValue");
-                m_comms.RegisterScriptInvocation(this,"JsonGetValueJson");
+                    m_comms.RegisterScriptInvocation(this,"JsonGetValue");
+                    m_comms.RegisterScriptInvocation(this,"JsonGetValueJson");
 
-                m_comms.RegisterScriptInvocation(this,"JsonTakeValue");
-                m_comms.RegisterScriptInvocation(this,"JsonTakeValueJson");
+                    m_comms.RegisterScriptInvocation(this,"JsonTakeValue");
+                    m_comms.RegisterScriptInvocation(this,"JsonTakeValueJson");
 
-                m_comms.RegisterScriptInvocation(this,"JsonReadValue");
-                m_comms.RegisterScriptInvocation(this,"JsonReadValueJson");
+                    m_comms.RegisterScriptInvocation(this,"JsonReadValue");
+                    m_comms.RegisterScriptInvocation(this,"JsonReadValueJson");
 
-                m_comms.RegisterScriptInvocation(this,"JsonSetValue");
-                m_comms.RegisterScriptInvocation(this,"JsonSetValueJson");
+                    m_comms.RegisterScriptInvocation(this,"JsonSetValue");
+                    m_comms.RegisterScriptInvocation(this,"JsonSetValueJson");
 
-                m_comms.RegisterScriptInvocation(this,"JsonRemoveValue");
+                    m_comms.RegisterScriptInvocation(this,"JsonRemoveValue");
+                }
+                catch (Exception e)
+                {
+                    // See http://opensimulator.org/mantis/view.php?id=5971 for more information
+                    m_log.WarnFormat("[JsonStroreScripts] script method registration failed; {0}",e.Message);
+                    m_enabled = false;
+                }
             }
         }
 
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
index 922eaaf..d192309 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         public Vector3 WorldPosition
         {
             get { return GetSP().AbsolutePosition; }
-            set { GetSP().TeleportWithMomentum(value); }
+            set { GetSP().Teleport(value); }
         }
         
         public bool IsChildAgent
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index adc6f9c..3ac1eb1 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -157,7 +157,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
                     sp.CompleteMovement(npcAvatar, false);
                     m_avatars.Add(npcAvatar.AgentId, npcAvatar);
-                    m_log.DebugFormat("[NPC MODULE]: Created NPC with id {0}", npcAvatar.AgentId);
+                    m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name);
 
                     return npcAvatar.AgentId;
                 }
@@ -340,7 +340,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     scene.RemoveClient(agentID, false);
                     m_avatars.Remove(agentID);
 
-//                    m_log.DebugFormat("[NPC MODULE]: Removed {0} {1}", agentID, av.Name);
+                    m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", agentID, av.Name);
                     return true;
                 }
             }