aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/NPC
diff options
context:
space:
mode:
authorBlueWall2012-02-03 18:20:26 -0500
committerBlueWall2012-02-03 18:20:26 -0500
commit0742630d813259483f0e56d1c6b807de78924c54 (patch)
tree8dacf402c0cd7065403f1f8c9735214825011448 /OpenSim/Region/OptionalModules/World/NPC
parentExtend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ... (diff)
parentFix: Covenant changed time not set http://opensimulator.org/mantis/view.php?i... (diff)
downloadopensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.zip
opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.tar.gz
opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.tar.bz2
opensim-SC_OLD-0742630d813259483f0e56d1c6b807de78924c54.tar.xz
Merge branch 'master' of /home/opensim/src/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 81bf9ed..be0d56e 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -933,7 +933,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
933 public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint) 933 public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint)
934 { 934 {
935 } 935 }
936 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) 936 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner)
937 { 937 {
938 } 938 }
939 939