aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/world/Avatar.cs
diff options
context:
space:
mode:
authorMW2007-04-30 15:38:51 +0000
committerMW2007-04-30 15:38:51 +0000
commita595881dc06c8359faa731a0af2d8be7290daad1 (patch)
tree3ce516a66b07b4695d9861f52ed91485cd14c2a0 /OpenSim.RegionServer/world/Avatar.cs
parentAnd it's fixed (diff)
downloadopensim-SC_OLD-a595881dc06c8359faa731a0af2d8be7290daad1.zip
opensim-SC_OLD-a595881dc06c8359faa731a0af2d8be7290daad1.tar.gz
opensim-SC_OLD-a595881dc06c8359faa731a0af2d8be7290daad1.tar.bz2
opensim-SC_OLD-a595881dc06c8359faa731a0af2d8be7290daad1.tar.xz
fixed the VS 2005 solution/ project files.
and a couple of other small changes
Diffstat (limited to 'OpenSim.RegionServer/world/Avatar.cs')
-rw-r--r--OpenSim.RegionServer/world/Avatar.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs
index 4f13a4a..97ed78d 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim.RegionServer/world/Avatar.cs
@@ -102,7 +102,7 @@ namespace OpenSim.world
102 102
103 public static void SetupTemplate(string name) 103 public static void SetupTemplate(string name)
104 { 104 {
105 /*int i = 0; 105 int i = 0;
106 FileInfo fInfo = new FileInfo(name); 106 FileInfo fInfo = new FileInfo(name);
107 long numBytes = fInfo.Length; 107 long numBytes = fInfo.Length;
108 FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read); 108 FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);
@@ -110,12 +110,11 @@ namespace OpenSim.world
110 byte[] data1 = br.ReadBytes((int)numBytes); 110 byte[] data1 = br.ReadBytes((int)numBytes);
111 br.Close(); 111 br.Close();
112 fStream.Close(); 112 fStream.Close();
113 * */ 113
114
115 libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i); 114 libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
116 115
117 SetDefaultPacketValues(objdata); 116 SetDefaultPacketValues(objdata);
118 //objdata.ObjectData = data1; 117 objdata.TextureEntry = data1;
119 objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24); 118 objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
120 objdata.PathCurve = 16; 119 objdata.PathCurve = 16;
121 objdata.ProfileCurve = 1; 120 objdata.ProfileCurve = 1;