diff options
| author | Dan Lake | 2012-02-03 15:21:37 -0800 |
|---|---|---|
| committer | Dan Lake | 2012-02-03 15:21:37 -0800 |
| commit | 4f8f44d9c3f42fbd841264fbede3e10ca253d016 (patch) | |
| tree | e6e26d76ef58c9422a6cf030580c1f7377d7d931 /OpenSim/Region/OptionalModules/World | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| parent | Merge branch 'master' of /home/opensim/src/opensim (diff) | |
| download | opensim-SC_OLD-4f8f44d9c3f42fbd841264fbede3e10ca253d016.zip opensim-SC_OLD-4f8f44d9c3f42fbd841264fbede3e10ca253d016.tar.gz opensim-SC_OLD-4f8f44d9c3f42fbd841264fbede3e10ca253d016.tar.bz2 opensim-SC_OLD-4f8f44d9c3f42fbd841264fbede3e10ca253d016.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
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 | ||