aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorgareth2007-03-01 02:02:01 +0000
committergareth2007-03-01 02:02:01 +0000
commit1122aa3efef161565eecf385deb7b57f646a5d79 (patch)
tree2b58b6a459ab07ada43d34720c7acb4b359fbb04
parentBroken asset code + ObjectUpdate FIXME (diff)
downloadopensim-SC-1122aa3efef161565eecf385deb7b57f646a5d79.zip
opensim-SC-1122aa3efef161565eecf385deb7b57f646a5d79.tar.gz
opensim-SC-1122aa3efef161565eecf385deb7b57f646a5d79.tar.bz2
opensim-SC-1122aa3efef161565eecf385deb7b57f646a5d79.tar.xz
WOOHOO! Avatar/Asset loading works!
-rw-r--r--src/Config.cs4
-rw-r--r--src/OpenSimClient.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Config.cs b/src/Config.cs
index 44e0689..d4a0797 100644
--- a/src/Config.cs
+++ b/src/Config.cs
@@ -68,9 +68,9 @@ namespace OpenSim
68 this.RegionHandle = Helpers.UIntsToLong((RegionLocX*256), (RegionLocY*256)); 68 this.RegionHandle = Helpers.UIntsToLong((RegionLocX*256), (RegionLocY*256));
69 this.IPListenPort = 9000; 69 this.IPListenPort = 9000;
70 this.IPListenAddr = "4.78.190.75"; 70 this.IPListenAddr = "4.78.190.75";
71 this.AssetURL = "http://osgrid.org/ogs/assetserver/"; 71 this.AssetURL = "http://www.osgrid.org/ogs/assetserver/";
72 this.AssetSendKey = "1234"; 72 this.AssetSendKey = "1234";
73 this.GridURL = "http://osgrid.org/ogs/gridserver/"; 73 this.GridURL = "http://www.osgrid.org/ogs/gridserver/";
74 this.GridSendKey = "1234"; 74 this.GridSendKey = "1234";
75 } 75 }
76 76
diff --git a/src/OpenSimClient.cs b/src/OpenSimClient.cs
index 8f07065..59833d8 100644
--- a/src/OpenSimClient.cs
+++ b/src/OpenSimClient.cs
@@ -89,7 +89,6 @@ namespace OpenSim
89 BinaryReader br = new BinaryReader(AssetResponse.GetResponseStream()); 89 BinaryReader br = new BinaryReader(AssetResponse.GetResponseStream());
90 idata = br.ReadBytes((int)AssetResponse.ContentLength); 90 idata = br.ReadBytes((int)AssetResponse.ContentLength);
91 br.Close(); 91 br.Close();
92 AssetResponse.Close();
93 92
94 TransferInfoPacket Transfer = new TransferInfoPacket(); 93 TransferInfoPacket Transfer = new TransferInfoPacket();
95 Transfer.TransferInfo.ChannelType = 2; 94 Transfer.TransferInfo.ChannelType = 2;
@@ -127,6 +126,7 @@ namespace OpenSim
127 TransferPacket.TransferData.Data = idata; 126 TransferPacket.TransferData.Data = idata;
128 OutPacket(TransferPacket); 127 OutPacket(TransferPacket);
129 } 128 }
129 AssetResponse.Close();
130 } 130 }
131 131
132 public void ProcessInPacket(Packet Pack) { 132 public void ProcessInPacket(Packet Pack) {
@@ -134,10 +134,10 @@ namespace OpenSim
134 switch(Pack.Type) { 134 switch(Pack.Type) {
135 case PacketType.CompleteAgentMovement: 135 case PacketType.CompleteAgentMovement:
136 ClientAvatar.CompleteMovement(OpenSim_Main.local_world); 136 ClientAvatar.CompleteMovement(OpenSim_Main.local_world);
137 ClientAvatar.SendInitialPosition();
137 break; 138 break;
138 case PacketType.RegionHandshakeReply: 139 case PacketType.RegionHandshakeReply:
139 OpenSim_Main.local_world.SendLayerData(this); 140 OpenSim_Main.local_world.SendLayerData(this);
140 ClientAvatar.SendInitialPosition();
141 break; 141 break;
142 case PacketType.AgentWearablesRequest: 142 case PacketType.AgentWearablesRequest:
143 ClientAvatar.SendInitialAppearance(); 143 ClientAvatar.SendInitialAppearance();