diff options
author | MW | 2007-06-20 17:32:21 +0000 |
---|---|---|
committer | MW | 2007-06-20 17:32:21 +0000 |
commit | 3e484d1aaf6d2d893f258e7372003de9bf5e8bdb (patch) | |
tree | 78eba8a9c1e77748d73d77e9f366021235a738b8 /OpenSim/OpenSim.RegionServer/ClientView.API.cs | |
parent | * and done the same for OGS.. (diff) | |
download | opensim-SC-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.zip opensim-SC-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.tar.gz opensim-SC-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.tar.bz2 opensim-SC-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.tar.xz |
Renamed Avatar to ScenePresence to avoid clash with libsl Avatar class.
Added ThirdPartyLicenses folder containing the licenses for the various third party libraries we use.
Plus some other small changes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientView.API.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs index ee6d741..1895fb9 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs | |||
@@ -483,13 +483,13 @@ namespace OpenSim | |||
483 | /// <param name="avatarID"></param> | 483 | /// <param name="avatarID"></param> |
484 | /// <param name="avatarLocalID"></param> | 484 | /// <param name="avatarLocalID"></param> |
485 | /// <param name="Pos"></param> | 485 | /// <param name="Pos"></param> |
486 | public void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos) | 486 | public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos) |
487 | { | 487 | { |
488 | System.Text.Encoding _enc = System.Text.Encoding.ASCII; | 488 | System.Text.Encoding _enc = System.Text.Encoding.ASCII; |
489 | //send a objectupdate packet with information about the clients avatar | 489 | //send a objectupdate packet with information about the clients avatar |
490 | 490 | ||
491 | ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); | 491 | ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); |
492 | objupdate.RegionData.RegionHandle = regionInfo.RegionHandle; | 492 | objupdate.RegionData.RegionHandle = regionHandle; |
493 | objupdate.RegionData.TimeDilation = 64096; | 493 | objupdate.RegionData.TimeDilation = 64096; |
494 | objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; | 494 | objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; |
495 | objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(); | 495 | objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(); |