aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
diff options
context:
space:
mode:
authorSnoopy Pfeffer2012-02-04 00:39:58 +0100
committerSnoopy Pfeffer2012-02-04 00:39:58 +0100
commitbd9d7484f0862da631a1e141e82021ca2108096e (patch)
tree38317af4db4af8ca85d7d81d5a7d1aec2c1039a8 /OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
parentChanged save oar and save iar parameter -p|--profile to -h|--home, including ... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-bd9d7484f0862da631a1e141e82021ca2108096e.zip
opensim-SC_OLD-bd9d7484f0862da631a1e141e82021ca2108096e.tar.gz
opensim-SC_OLD-bd9d7484f0862da631a1e141e82021ca2108096e.tar.bz2
opensim-SC_OLD-bd9d7484f0862da631a1e141e82021ca2108096e.tar.xz
Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs')
-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