ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed the VS 2005 solution/ project files.

Browse Source 
and a couple of other small changes
This commit is contained in:
MW
2007-04-30 15:38:51 +00:00
parent 538179c526
commit a595881dc0
10 changed files with 252 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim.RegionServer/AgentAssetUpload.cs
View File

@@ -70,7 +70,7 @@ namespace OpenSim
public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID)
{
Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString());
// Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString());
AssetBase asset = null;
if (pack.AssetBlock.Type == 0)
{

7
OpenSim.RegionServer/world/Avatar.cs
View File

@@ -102,7 +102,7 @@ namespace OpenSim.world
public static void SetupTemplate(string name)
{
/*int i = 0;
int i = 0;
FileInfo fInfo = new FileInfo(name);
long numBytes = fInfo.Length;
FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);
@@ -110,12 +110,11 @@ namespace OpenSim.world
byte[] data1 = br.ReadBytes((int)numBytes);
br.Close();
fStream.Close();
* */
libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
SetDefaultPacketValues(objdata);
//objdata.ObjectData = data1;
objdata.TextureEntry = data1;
objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
objdata.PathCurve = 16;
objdata.ProfileCurve = 1;

34
OpenSim.RegionServer/world/Primitive2.cs
View File

@@ -145,6 +145,35 @@ namespace OpenSim.world
}
public void GetProperites(SimClient client)
{
ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
proper.ObjectData[0].ItemID = LLUUID.Zero;
proper.ObjectData[0].CreationDate = (ulong)this.primData.CreationDate;
proper.ObjectData[0].CreatorID = this.primData.OwnerID;
proper.ObjectData[0].FolderID = LLUUID.Zero;
proper.ObjectData[0].FromTaskID = LLUUID.Zero;
proper.ObjectData[0].GroupID = LLUUID.Zero;
proper.ObjectData[0].InventorySerial = 0;
proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
proper.ObjectData[0].ObjectID = this.uuid;
proper.ObjectData[0].OwnerID = primData.OwnerID;
proper.ObjectData[0].TouchName = new byte[0];
proper.ObjectData[0].TextureID = new byte[0];
proper.ObjectData[0].SitName = new byte[0];
proper.ObjectData[0].Name = new byte[0];
proper.ObjectData[0].Description = new byte[0];
proper.ObjectData[0].OwnerMask = this.primData.OwnerMask;
proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
proper.ObjectData[0].GroupMask = this.primData.GroupMask;
proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
proper.ObjectData[0].BaseMask = this.primData.BaseMask;
client.OutPacket(proper);
}
#endregion
# region Inventory Methods
@@ -290,6 +319,11 @@ namespace OpenSim.world
}
public void CreateFromPrimData(PrimData primData)
{
this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false);
}
public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim)
{
}

2
OpenSim.RegionServer/world/World.cs
View File

@@ -72,7 +72,7 @@ namespace OpenSim.world
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap");
TerrainManager = new TerrainManager(new SecondLife());
Terrain = new TerrainEngine();
Avatar.SetupTemplate("avatar-template2.dat");
Avatar.SetupTemplate("avatar-texture.dat");
// MainConsole.Instance.WriteLine("World.cs - Creating script engine instance");
// Initialise this only after the world has loaded
// Scripts = new ScriptEngine(this);