From 1122aa3efef161565eecf385deb7b57f646a5d79 Mon Sep 17 00:00:00 2001
From: gareth
Date: Thu, 1 Mar 2007 02:02:01 +0000
Subject: WOOHOO! Avatar/Asset loading works!

---
 src/Config.cs        | 4 ++--
 src/OpenSimClient.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

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
 			this.RegionHandle = Helpers.UIntsToLong((RegionLocX*256), (RegionLocY*256));
 			this.IPListenPort = 9000;
 			this.IPListenAddr = "4.78.190.75";
-			this.AssetURL = "http://osgrid.org/ogs/assetserver/";
+			this.AssetURL = "http://www.osgrid.org/ogs/assetserver/";
 			this.AssetSendKey = "1234";
-			this.GridURL = "http://osgrid.org/ogs/gridserver/";
+			this.GridURL = "http://www.osgrid.org/ogs/gridserver/";
 			this.GridSendKey = "1234";
 		}
 
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
 			BinaryReader br = new BinaryReader(AssetResponse.GetResponseStream());
 			idata = br.ReadBytes((int)AssetResponse.ContentLength);
 			br.Close();
-			AssetResponse.Close();
 		
 			TransferInfoPacket Transfer = new TransferInfoPacket();
 			Transfer.TransferInfo.ChannelType = 2;
@@ -127,6 +126,7 @@ namespace OpenSim
 				TransferPacket.TransferData.Data = idata;
 				OutPacket(TransferPacket);
 			}
+			AssetResponse.Close();
 		}
 		
 		public void ProcessInPacket(Packet Pack) {
@@ -134,10 +134,10 @@ namespace OpenSim
 		    switch(Pack.Type) {
 			case PacketType.CompleteAgentMovement:
 				ClientAvatar.CompleteMovement(OpenSim_Main.local_world);
+                                ClientAvatar.SendInitialPosition();
 			break;
 			case PacketType.RegionHandshakeReply:
 				OpenSim_Main.local_world.SendLayerData(this);	
-				ClientAvatar.SendInitialPosition();
 			break;
 			case PacketType.AgentWearablesRequest:
 				ClientAvatar.SendInitialAppearance();
-- 
cgit v1.1