aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs15
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs31
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs8
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs16
-rw-r--r--OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs21
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs47
9 files changed, 102 insertions, 46 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 43548e6..a37e997 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -714,6 +714,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
714 public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; 714 public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
715 public event UpdatePrimFlags OnUpdatePrimFlags; 715 public event UpdatePrimFlags OnUpdatePrimFlags;
716 public event UpdatePrimTexture OnUpdatePrimTexture; 716 public event UpdatePrimTexture OnUpdatePrimTexture;
717 public event ClientChangeObject onClientChangeObject;
717 public event UpdateVector OnUpdatePrimGroupPosition; 718 public event UpdateVector OnUpdatePrimGroupPosition;
718 public event UpdateVector OnUpdatePrimSinglePosition; 719 public event UpdateVector OnUpdatePrimSinglePosition;
719 public event UpdatePrimRotation OnUpdatePrimGroupRotation; 720 public event UpdatePrimRotation OnUpdatePrimGroupRotation;
@@ -818,6 +819,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
818 public event ObjectOwner OnObjectOwner; 819 public event ObjectOwner OnObjectOwner;
819 public event DirPlacesQuery OnDirPlacesQuery; 820 public event DirPlacesQuery OnDirPlacesQuery;
820 public event DirFindQuery OnDirFindQuery; 821 public event DirFindQuery OnDirFindQuery;
822 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
821 public event DirLandQuery OnDirLandQuery; 823 public event DirLandQuery OnDirLandQuery;
822 public event DirPopularQuery OnDirPopularQuery; 824 public event DirPopularQuery OnDirPopularQuery;
823 public event DirClassifiedQuery OnDirClassifiedQuery; 825 public event DirClassifiedQuery OnDirClassifiedQuery;
@@ -834,7 +836,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
834 public event ClassifiedInfoRequest OnClassifiedInfoRequest; 836 public event ClassifiedInfoRequest OnClassifiedInfoRequest;
835 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; 837 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
836 public event ClassifiedDelete OnClassifiedDelete; 838 public event ClassifiedDelete OnClassifiedDelete;
837 public event ClassifiedDelete OnClassifiedGodDelete; 839 public event ClassifiedGodDelete OnClassifiedGodDelete;
838 public event EventNotificationAddRequest OnEventNotificationAddRequest; 840 public event EventNotificationAddRequest OnEventNotificationAddRequest;
839 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 841 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
840 public event EventGodDelete OnEventGodDelete; 842 public event EventGodDelete OnEventGodDelete;
@@ -864,6 +866,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
864 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; 866 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
865 public event SimWideDeletesDelegate OnSimWideDeletes; 867 public event SimWideDeletesDelegate OnSimWideDeletes;
866 public event SendPostcard OnSendPostcard; 868 public event SendPostcard OnSendPostcard;
869 public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
867 public event MuteListEntryUpdate OnUpdateMuteListEntry; 870 public event MuteListEntryUpdate OnUpdateMuteListEntry;
868 public event MuteListEntryRemove OnRemoveMuteListEntry; 871 public event MuteListEntryRemove OnRemoveMuteListEntry;
869 public event GodlikeMessage onGodlikeMessage; 872 public event GodlikeMessage onGodlikeMessage;
@@ -885,6 +888,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
885 888
886 public void Close() 889 public void Close()
887 { 890 {
891 Close(true);
892 }
893
894 public void Close(bool sendStop)
895 {
888 Disconnect(); 896 Disconnect();
889 } 897 }
890 898
@@ -1690,5 +1698,10 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1690 public void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data) 1698 public void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data)
1691 { 1699 {
1692 } 1700 }
1701
1702 public void SendPartPhysicsProprieties(ISceneEntity entity)
1703 {
1704 }
1705
1693 } 1706 }
1694} 1707}
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 05678c0..8af3652 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -563,7 +563,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
563 563
564 public Hashtable FreeSwitchSLVoiceGetPreloginHTTPHandler(Hashtable request) 564 public Hashtable FreeSwitchSLVoiceGetPreloginHTTPHandler(Hashtable request)
565 { 565 {
566 m_log.Debug("[FreeSwitchVoice]: FreeSwitchSLVoiceGetPreloginHTTPHandler called"); 566// m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceGetPreloginHTTPHandler called");
567 567
568 Hashtable response = new Hashtable(); 568 Hashtable response = new Hashtable();
569 response["content_type"] = "text/xml"; 569 response["content_type"] = "text/xml";
@@ -714,7 +714,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
714 714
715 public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request) 715 public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request)
716 { 716 {
717 m_log.Debug("[FreeSwitchVoice]: FreeSwitchSLVoiceSigninHTTPHandler called"); 717 //m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceSigninHTTPHandler called");
718// string requestbody = (string)request["body"]; 718// string requestbody = (string)request["body"];
719// string uri = (string)request["uri"]; 719// string uri = (string)request["uri"];
720// string contenttype = (string)request["content-type"]; 720// string contenttype = (string)request["content-type"];
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 738133c..4dbac1d 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -190,7 +190,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
190 break; 190 break;
191 } 191 }
192 192
193 m_vivoxVoiceAccountApi = String.Format("http://{0}/api2", m_vivoxServer); 193 m_vivoxVoiceAccountApi = String.Format("https://{0}/api2", m_vivoxServer);
194 194
195 // Admin interface required values 195 // Admin interface required values
196 if (String.IsNullOrEmpty(m_vivoxServer) || 196 if (String.IsNullOrEmpty(m_vivoxServer) ||
@@ -732,7 +732,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
732 return channelUri; 732 return channelUri;
733 } 733 }
734 734
735 private static readonly string m_vivoxLoginPath = "http://{0}/api2/viv_signin.php?userid={1}&pwd={2}"; 735
736 private static readonly string m_vivoxLoginPath = "https://{0}/api2/viv_signin.php?userid={1}&pwd={2}";
736 737
737 /// <summary> 738 /// <summary>
738 /// Perform administrative login for Vivox. 739 /// Perform administrative login for Vivox.
@@ -744,7 +745,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
744 return VivoxCall(requrl, false); 745 return VivoxCall(requrl, false);
745 } 746 }
746 747
747 private static readonly string m_vivoxLogoutPath = "http://{0}/api2/viv_signout.php?auth_token={1}"; 748 private static readonly string m_vivoxLogoutPath = "https://{0}/api2/viv_signout.php?auth_token={1}";
748 749
749 /// <summary> 750 /// <summary>
750 /// Perform administrative logout for Vivox. 751 /// Perform administrative logout for Vivox.
@@ -755,7 +756,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
755 return VivoxCall(requrl, false); 756 return VivoxCall(requrl, false);
756 } 757 }
757 758
758 private static readonly string m_vivoxGetAccountPath = "http://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}"; 759
760 private static readonly string m_vivoxGetAccountPath = "https://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}";
759 761
760 /// <summary> 762 /// <summary>
761 /// Retrieve account information for the specified user. 763 /// Retrieve account information for the specified user.
@@ -767,7 +769,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
767 return VivoxCall(requrl, true); 769 return VivoxCall(requrl, true);
768 } 770 }
769 771
770 private static readonly string m_vivoxNewAccountPath = "http://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}"; 772
773 private static readonly string m_vivoxNewAccountPath = "https://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}";
771 774
772 /// <summary> 775 /// <summary>
773 /// Creates a new account. 776 /// Creates a new account.
@@ -781,7 +784,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
781 return VivoxCall(requrl, true); 784 return VivoxCall(requrl, true);
782 } 785 }
783 786
784 private static readonly string m_vivoxPasswordPath = "http://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}"; 787
788 private static readonly string m_vivoxPasswordPath = "https://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}";
785 789
786 /// <summary> 790 /// <summary>
787 /// Change the user's password. 791 /// Change the user's password.
@@ -792,7 +796,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
792 return VivoxCall(requrl, true); 796 return VivoxCall(requrl, true);
793 } 797 }
794 798
795 private static readonly string m_vivoxChannelPath = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}"; 799
800 private static readonly string m_vivoxChannelPath = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}";
796 801
797 /// <summary> 802 /// <summary>
798 /// Create a channel. 803 /// Create a channel.
@@ -864,7 +869,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
864 return false; 869 return false;
865 } 870 }
866 871
867 private static readonly string m_vivoxChannelSearchPath = "http://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}"; 872 private static readonly string m_vivoxChannelSearchPath = "https://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}";
868 873
869 /// <summary> 874 /// <summary>
870 /// Retrieve a channel. 875 /// Retrieve a channel.
@@ -1007,7 +1012,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1007 return false; 1012 return false;
1008 } 1013 }
1009 1014
1010 // private static readonly string m_vivoxChannelById = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; 1015 // private static readonly string m_vivoxChannelById = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}";
1011 1016
1012 // private XmlElement VivoxGetChannelById(string parent, string channelid) 1017 // private XmlElement VivoxGetChannelById(string parent, string channelid)
1013 // { 1018 // {
@@ -1019,7 +1024,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1019 // return VivoxCall(requrl, true); 1024 // return VivoxCall(requrl, true);
1020 // } 1025 // }
1021 1026
1022 private static readonly string m_vivoxChannelDel = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; 1027 private static readonly string m_vivoxChannelDel = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}";
1023 1028
1024 /// <summary> 1029 /// <summary>
1025 /// Delete a channel. 1030 /// Delete a channel.
@@ -1032,6 +1037,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1032 /// are required in a later phase. 1037 /// are required in a later phase.
1033 /// In this case the call handles parent and description as optional values. 1038 /// In this case the call handles parent and description as optional values.
1034 /// </summary> 1039 /// </summary>
1040
1035 private XmlElement VivoxDeleteChannel(string parent, string channelid) 1041 private XmlElement VivoxDeleteChannel(string parent, string channelid)
1036 { 1042 {
1037 string requrl = String.Format(m_vivoxChannelDel, m_vivoxServer, "delete", channelid, m_authToken); 1043 string requrl = String.Format(m_vivoxChannelDel, m_vivoxServer, "delete", channelid, m_authToken);
@@ -1042,11 +1048,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1042 return VivoxCall(requrl, true); 1048 return VivoxCall(requrl, true);
1043 } 1049 }
1044 1050
1045 private static readonly string m_vivoxChannelSearch = "http://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}"; 1051 private static readonly string m_vivoxChannelSearch = "https://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}";
1046 1052
1047 /// <summary> 1053 /// <summary>
1048 /// Return information on channels in the given directory 1054 /// Return information on channels in the given directory
1049 /// </summary> 1055 /// </summary>
1056
1050 private XmlElement VivoxListChildren(string channelid) 1057 private XmlElement VivoxListChildren(string channelid)
1051 { 1058 {
1052 string requrl = String.Format(m_vivoxChannelSearch, m_vivoxServer, channelid, m_authToken); 1059 string requrl = String.Format(m_vivoxChannelSearch, m_vivoxServer, channelid, m_authToken);
@@ -1308,4 +1315,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1308 return false; 1315 return false;
1309 } 1316 }
1310 } 1317 }
1311} \ No newline at end of file 1318}
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index e669f4c..65bd26c 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -892,7 +892,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
892 msg.dialog = dialog; 892 msg.dialog = dialog;
893 // msg.dialog = (byte)OpenMetaverse.InstantMessageDialog.GroupNotice; 893 // msg.dialog = (byte)OpenMetaverse.InstantMessageDialog.GroupNotice;
894 msg.fromGroup = true; 894 msg.fromGroup = true;
895 msg.offline = (byte)0; 895 msg.offline = (byte)1; // Allow this message to be stored for offline use
896 msg.ParentEstateID = 0; 896 msg.ParentEstateID = 0;
897 msg.Position = Vector3.Zero; 897 msg.Position = Vector3.Zero;
898 msg.RegionID = UUID.Zero.Guid; 898 msg.RegionID = UUID.Zero.Guid;
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
index c1957e2..59ff9b8 100644
--- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
+++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
@@ -121,12 +121,18 @@ namespace OpenSim.Region.OptionalModules
121 121
122 private bool CanObjectEnter(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene) 122 private bool CanObjectEnter(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene)
123 { 123 {
124 if ((newPoint.X > 257f || newPoint.X < -1f || newPoint.Y > 257f || newPoint.Y < -1f))
125 return true;
126
124 SceneObjectPart obj = scene.GetSceneObjectPart(objectID); 127 SceneObjectPart obj = scene.GetSceneObjectPart(objectID);
125 Vector3 oldPoint = obj.GroupPosition; 128 Vector3 oldPoint = obj.GroupPosition;
126 int objectCount = obj.ParentGroup.PrimCount; 129 int objectCount = obj.ParentGroup.PrimCount;
127 ILandObject oldParcel = scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y); 130 ILandObject oldParcel = scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y);
128 ILandObject newParcel = scene.LandChannel.GetLandObject(newPoint.X, newPoint.Y); 131 ILandObject newParcel = scene.LandChannel.GetLandObject(newPoint.X, newPoint.Y);
129 132
133 if (newParcel == null)
134 return true;
135
130 int usedPrims = newParcel.PrimCounts.Total; 136 int usedPrims = newParcel.PrimCounts.Total;
131 int simulatorCapacity = newParcel.GetSimulatorMaxPrimCount(); 137 int simulatorCapacity = newParcel.GetSimulatorMaxPrimCount();
132 138
@@ -171,4 +177,4 @@ namespace OpenSim.Region.OptionalModules
171 return true; 177 return true;
172 } 178 }
173 } 179 }
174} \ No newline at end of file 180}
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
index 32659c8..11c87f8 100644
--- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
@@ -42,17 +42,22 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
42 public class XmlRpcRouter : IRegionModule, IXmlRpcRouter 42 public class XmlRpcRouter : IRegionModule, IXmlRpcRouter
43 { 43 {
44 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45 private bool m_enabled = false;
46 public void Initialise(Scene scene, IConfigSource config) 46 public void Initialise(Scene scene, IConfigSource config)
47 { 47 {
48 IConfig startupConfig = config.Configs["Startup"]; 48 IConfig startupConfig = config.Configs["XMLRPC"];
49 if (startupConfig == null) 49 if (startupConfig == null)
50 return; 50 return;
51 51
52 if (startupConfig.GetString("XmlRpcRouterModule", 52 if (startupConfig.GetString("XmlRpcRouterModule",
53 "XmlRpcRouterModule") == "XmlRpcRouterModule") 53 "") == "XmlRpcRouterModule")
54 { 54 {
55 scene.RegisterModuleInterface<IXmlRpcRouter>(this); 55 scene.RegisterModuleInterface<IXmlRpcRouter>(this);
56 m_enabled = true;
57 }
58 else
59 {
60 m_enabled = false;
56 } 61 }
57 } 62 }
58 63
@@ -76,7 +81,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
76 81
77 public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri) 82 public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri)
78 { 83 {
79 scriptEngine.PostScriptEvent(itemID, "xmlrpc_uri", new Object[] {uri}); 84 if (m_enabled)
85 {
86 scriptEngine.PostScriptEvent(itemID, "xmlrpc_uri", new Object[] { uri });
87 }
80 } 88 }
81 89
82 public void ScriptRemoved(UUID itemID) 90 public void ScriptRemoved(UUID itemID)
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 9c838d0..d206f69 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -838,6 +838,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
838 if (module != null) 838 if (module != null)
839 module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice); 839 module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice);
840 } 840 }
841
842 public void MoveMoney(UUID fromAgentID, UUID toAgentID, int amount, string text)
843 {
844 }
841 } 845 }
842 846
843 public enum TransactionType : int 847 public enum TransactionType : int
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index e57e5e6..c9c12c6 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
47 private readonly string m_firstname; 47 private readonly string m_firstname;
48 private readonly string m_lastname; 48 private readonly string m_lastname;
49 private readonly Vector3 m_startPos; 49 private readonly Vector3 m_startPos;
50 private readonly UUID m_uuid = UUID.Random(); 50 private UUID m_uuid = UUID.Random();
51 private readonly Scene m_scene; 51 private readonly Scene m_scene;
52 private readonly UUID m_ownerID; 52 private readonly UUID m_ownerID;
53 53
@@ -174,7 +174,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
174#pragma warning disable 67 174#pragma warning disable 67
175 public event Action<IClientAPI> OnLogout; 175 public event Action<IClientAPI> OnLogout;
176 public event ObjectPermissions OnObjectPermissions; 176 public event ObjectPermissions OnObjectPermissions;
177 177 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
178 public event MoneyTransferRequest OnMoneyTransferRequest; 178 public event MoneyTransferRequest OnMoneyTransferRequest;
179 public event ParcelBuy OnParcelBuy; 179 public event ParcelBuy OnParcelBuy;
180 public event Action<IClientAPI> OnConnectionClosed; 180 public event Action<IClientAPI> OnConnectionClosed;
@@ -243,6 +243,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
243 public event UpdatePrimTexture OnUpdatePrimTexture; 243 public event UpdatePrimTexture OnUpdatePrimTexture;
244 public event UpdateVector OnUpdatePrimGroupPosition; 244 public event UpdateVector OnUpdatePrimGroupPosition;
245 public event UpdateVector OnUpdatePrimSinglePosition; 245 public event UpdateVector OnUpdatePrimSinglePosition;
246 public event ClientChangeObject onClientChangeObject;
246 public event UpdatePrimRotation OnUpdatePrimGroupRotation; 247 public event UpdatePrimRotation OnUpdatePrimGroupRotation;
247 public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition; 248 public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition;
248 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; 249 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
@@ -380,7 +381,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
380 public event ClassifiedInfoRequest OnClassifiedInfoRequest; 381 public event ClassifiedInfoRequest OnClassifiedInfoRequest;
381 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; 382 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
382 public event ClassifiedDelete OnClassifiedDelete; 383 public event ClassifiedDelete OnClassifiedDelete;
383 public event ClassifiedDelete OnClassifiedGodDelete; 384 public event ClassifiedGodDelete OnClassifiedGodDelete;
384 385
385 public event EventNotificationAddRequest OnEventNotificationAddRequest; 386 public event EventNotificationAddRequest OnEventNotificationAddRequest;
386 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 387 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -419,6 +420,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
419 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; 420 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
420 public event SimWideDeletesDelegate OnSimWideDeletes; 421 public event SimWideDeletesDelegate OnSimWideDeletes;
421 public event SendPostcard OnSendPostcard; 422 public event SendPostcard OnSendPostcard;
423 public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
422 public event MuteListEntryUpdate OnUpdateMuteListEntry; 424 public event MuteListEntryUpdate OnUpdateMuteListEntry;
423 public event MuteListEntryRemove OnRemoveMuteListEntry; 425 public event MuteListEntryRemove OnRemoveMuteListEntry;
424 public event GodlikeMessage onGodlikeMessage; 426 public event GodlikeMessage onGodlikeMessage;
@@ -446,6 +448,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
446 public virtual UUID AgentId 448 public virtual UUID AgentId
447 { 449 {
448 get { return m_uuid; } 450 get { return m_uuid; }
451 set { m_uuid = value; }
449 } 452 }
450 453
451 public UUID SessionId 454 public UUID SessionId
@@ -854,8 +857,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
854 857
855 public void Close() 858 public void Close()
856 { 859 {
857 // Remove ourselves from the scene 860 Close(true);
858 m_scene.RemoveClient(AgentId, false); 861 }
862
863 public void Close(bool sendStop)
864 {
859 } 865 }
860 866
861 public void Start() 867 public void Start()
@@ -1189,5 +1195,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
1189 public void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data) 1195 public void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data)
1190 { 1196 {
1191 } 1197 }
1198
1199 public void SendPartPhysicsProprieties(ISceneEntity entity)
1200 {
1201 }
1202
1192 } 1203 }
1193} 1204}
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 3ac1eb1..9c77b59 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -144,29 +144,30 @@ namespace OpenSim.Region.OptionalModules.World.NPC
144// acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]); 144// acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]);
145// } 145// }
146 146
147 lock (m_avatars) 147 ManualResetEvent ev = new ManualResetEvent(false);
148 {
149 scene.AuthenticateHandler.AddNewCircuit(npcAvatar.CircuitCode, acd);
150 scene.AddNewClient(npcAvatar, PresenceType.Npc);
151 148
152 ScenePresence sp; 149 Util.FireAndForget(delegate(object x) {
153 if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp)) 150 lock (m_avatars)
154 { 151 {
155// m_log.DebugFormat( 152 scene.AuthenticateHandler.AddNewCircuit(npcAvatar.CircuitCode, acd);
156// "[NPC MODULE]: Successfully retrieved scene presence for NPC {0} {1}", sp.Name, sp.UUID); 153 scene.AddNewClient(npcAvatar, PresenceType.Npc);
157 154
158 sp.CompleteMovement(npcAvatar, false); 155 ScenePresence sp;
159 m_avatars.Add(npcAvatar.AgentId, npcAvatar); 156 if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp))
160 m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name); 157 {
161 158 sp.CompleteMovement(npcAvatar, false);
162 return npcAvatar.AgentId; 159 m_avatars.Add(npcAvatar.AgentId, npcAvatar);
163 } 160 m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name);
164 else 161 }
165 {
166 m_log.WarnFormat("[NPC MODULE]: Could not find scene presence for NPC {0} {1}", sp.Name, sp.UUID);
167 return UUID.Zero;
168 } 162 }
169 } 163 ev.Set();
164 });
165
166 ev.WaitOne();
167
168// m_log.DebugFormat("[NPC MODULE]: Created NPC with id {0}", npcAvatar.AgentId);
169
170 return npcAvatar.AgentId;
170 } 171 }
171 172
172 public bool MoveToTarget(UUID agentID, Scene scene, Vector3 pos, bool noFly, bool landAtTarget) 173 public bool MoveToTarget(UUID agentID, Scene scene, Vector3 pos, bool noFly, bool landAtTarget)
@@ -355,9 +356,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC
355 { 356 {
356 NPCAvatar av; 357 NPCAvatar av;
357 if (m_avatars.TryGetValue(npcID, out av)) 358 if (m_avatars.TryGetValue(npcID, out av))
359 {
360 if (npcID == callerID)
361 return true;
358 return CheckPermissions(av, callerID); 362 return CheckPermissions(av, callerID);
363 }
359 else 364 else
365 {
360 return false; 366 return false;
367 }
361 } 368 }
362 } 369 }
363 370
@@ -369,7 +376,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
369 /// <returns>true if they do, false if they don't.</returns> 376 /// <returns>true if they do, false if they don't.</returns>
370 private bool CheckPermissions(NPCAvatar av, UUID callerID) 377 private bool CheckPermissions(NPCAvatar av, UUID callerID)
371 { 378 {
372 return callerID == UUID.Zero || av.OwnerID == UUID.Zero || av.OwnerID == callerID; 379 return callerID == UUID.Zero || av.OwnerID == UUID.Zero || av.OwnerID == callerID || av.AgentId == callerID;
373 } 380 }
374 } 381 }
375} 382}