diff options
author | lbsa71 | 2007-06-09 21:45:58 +0000 |
---|---|---|
committer | lbsa71 | 2007-06-09 21:45:58 +0000 |
commit | 4224b695acc2e1ad0199dc0ad7f560494182ed54 (patch) | |
tree | 8fae1cf25a058bc4e378ef2b6ce264d7f9f0b910 /OpenSim/OpenSim.World/Avatar.cs | |
parent | *Fixed casting mishap in last commit - client now starts up without crashing (diff) | |
download | opensim-SC-4224b695acc2e1ad0199dc0ad7f560494182ed54.zip opensim-SC-4224b695acc2e1ad0199dc0ad7f560494182ed54.tar.gz opensim-SC-4224b695acc2e1ad0199dc0ad7f560494182ed54.tar.bz2 opensim-SC-4224b695acc2e1ad0199dc0ad7f560494182ed54.tar.xz |
* LogFile now defaults to "{apptype}.log"
* cleaned away suo and user files.
* added handy string chat variety to the API
* Moved LockPhysicsEngine on World to SyncRoot on IWorld
* Introduced NextLocalId instead of World fuggliness.
* Transformed GetRegionInfo to Property on IWorld for great justice
* Extracted default wearables (good to have)
* Deleted unused BaseServer
* Used IWorld instead of World wherever possible
* The client constructor's not getting unused port any longer.
* Extracted ClientView factoring so PacketServer can be tweaked.
* Added SendLayerData to World
* Made WorldBase abstract and cleaned it up a bit
* added OpenGrid.Framework.Communications.dll.build and OpenSim.World.dll.build to svn
* Added code for two examples (but not in prebuild yet)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.World/Avatar.cs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs index c251d57..4ab576c 100644 --- a/OpenSim/OpenSim.World/Avatar.cs +++ b/OpenSim/OpenSim.World/Avatar.cs | |||
@@ -55,21 +55,16 @@ namespace OpenSim.world | |||
55 | ControllingClient = theClient; | 55 | ControllingClient = theClient; |
56 | this.firstname = ControllingClient.FirstName; | 56 | this.firstname = ControllingClient.FirstName; |
57 | this.lastname = ControllingClient.LastName; | 57 | this.lastname = ControllingClient.LastName; |
58 | localid = 8880000 + (this.m_world._localNumber++); | 58 | localid = this.m_world.NextLocalId; |
59 | Pos = ControllingClient.StartPos; | 59 | Pos = ControllingClient.StartPos; |
60 | visualParams = new byte[218]; | 60 | visualParams = new byte[218]; |
61 | for (int i = 0; i < 218; i++) | 61 | for (int i = 0; i < 218; i++) |
62 | { | 62 | { |
63 | visualParams[i] = 100; | 63 | visualParams[i] = 100; |
64 | } | 64 | } |
65 | Wearables = new AvatarWearable[13]; //should be 13 of these | ||
66 | for (int i = 0; i < 13; i++) | ||
67 | { | ||
68 | Wearables[i] = new AvatarWearable(); | ||
69 | } | ||
70 | this.Wearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); | ||
71 | this.Wearables[0].ItemID = LLUUID.Random(); | ||
72 | 65 | ||
66 | Wearables = AvatarWearable.DefaultWearables; | ||
67 | |||
73 | this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); | 68 | this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); |
74 | Console.WriteLine("avatar point 4"); | 69 | Console.WriteLine("avatar point 4"); |
75 | 70 | ||