diff options
-rw-r--r-- | OpenGridServices.AssetServer/Main.cs | 63 | ||||
-rw-r--r-- | OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj | 129 | ||||
-rw-r--r-- | OpenSim.Framework/OpenSim.Framework.csproj | 6 | ||||
-rw-r--r-- | OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs | 2 | ||||
-rw-r--r-- | OpenSim.RegionServer/AgentAssetUpload.cs | 2 | ||||
-rw-r--r-- | OpenSim.RegionServer/world/Avatar.cs | 7 | ||||
-rw-r--r-- | OpenSim.RegionServer/world/Primitive2.cs | 34 | ||||
-rw-r--r-- | OpenSim.RegionServer/world/World.cs | 2 | ||||
-rw-r--r-- | OpenSim.sln | 78 | ||||
-rw-r--r-- | bin/avatar-texture.dat | bin | 0 -> 268 bytes |
10 files changed, 252 insertions, 71 deletions
diff --git a/OpenGridServices.AssetServer/Main.cs b/OpenGridServices.AssetServer/Main.cs index b57a5a5..21a4fce 100644 --- a/OpenGridServices.AssetServer/Main.cs +++ b/OpenGridServices.AssetServer/Main.cs | |||
@@ -32,18 +32,18 @@ using System.IO; | |||
32 | using System.Text; | 32 | using System.Text; |
33 | using System.Timers; | 33 | using System.Timers; |
34 | using System.Net; | 34 | using System.Net; |
35 | using System.Reflection; | 35 | using System.Reflection; |
36 | using System.Threading; | 36 | using System.Threading; |
37 | using libsecondlife; | 37 | using libsecondlife; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Sims; | 39 | using OpenSim.Framework.Sims; |
40 | using OpenSim.Framework.Console; | 40 | using OpenSim.Framework.Console; |
41 | using OpenSim.Framework.Types; | 41 | using OpenSim.Framework.Types; |
42 | using OpenSim.Framework.Interfaces; | 42 | using OpenSim.Framework.Interfaces; |
43 | using OpenSim.GridInterfaces.Local; // REFACTORING IS NEEDED!!!!!!!!!!! | 43 | using OpenSim.GridInterfaces.Local; // REFACTORING IS NEEDED!!!!!!!!!!! |
44 | using OpenSim.Servers; | 44 | using OpenSim.Servers; |
45 | using Db4objects.Db4o; | 45 | using Db4objects.Db4o; |
46 | using Db4objects.Db4o.Query; | 46 | using Db4objects.Db4o.Query; |
47 | 47 | ||
48 | namespace OpenGridServices.AssetServer | 48 | namespace OpenGridServices.AssetServer |
49 | { | 49 | { |
@@ -54,7 +54,7 @@ namespace OpenGridServices.AssetServer | |||
54 | private IObjectContainer db; | 54 | private IObjectContainer db; |
55 | 55 | ||
56 | public static OpenAsset_Main assetserver; | 56 | public static OpenAsset_Main assetserver; |
57 | 57 | ||
58 | private ConsoleBase m_console; | 58 | private ConsoleBase m_console; |
59 | 59 | ||
60 | [STAThread] | 60 | [STAThread] |
@@ -85,9 +85,10 @@ namespace OpenGridServices.AssetServer | |||
85 | } | 85 | } |
86 | 86 | ||
87 | public void Startup() | 87 | public void Startup() |
88 | { m_console.WriteLine("Main.cs:Startup() - Setting up asset DB"); | 88 | { |
89 | setupDB(); | 89 | m_console.WriteLine("Main.cs:Startup() - Setting up asset DB"); |
90 | 90 | setupDB(); | |
91 | |||
91 | m_console.WriteLine("Main.cs:Startup() - Starting HTTP process"); | 92 | m_console.WriteLine("Main.cs:Startup() - Starting HTTP process"); |
92 | BaseHttpServer httpServer = new BaseHttpServer(8003); | 93 | BaseHttpServer httpServer = new BaseHttpServer(8003); |
93 | 94 | ||
@@ -98,18 +99,18 @@ namespace OpenGridServices.AssetServer | |||
98 | httpServer.Start(); | 99 | httpServer.Start(); |
99 | 100 | ||
100 | } | 101 | } |
101 | 102 | ||
102 | public string assetGetMethod(string request, string path, string param) { | 103 | public string assetGetMethod(string request, string path, string param) { |
103 | byte[] assetdata=getAssetData(new LLUUID(param),false); | 104 | byte[] assetdata=getAssetData(new LLUUID(param),false); |
104 | if(assetdata!=null) { | 105 | if(assetdata!=null) { |
105 | return System.Text.Encoding.ASCII.GetString(assetdata); | 106 | return System.Text.Encoding.ASCII.GetString(assetdata); |
106 | } else { | 107 | } else { |
107 | return ""; | 108 | return ""; |
108 | } | 109 | } |
109 | 110 | ||
110 | } | 111 | } |
111 | 112 | ||
112 | public byte[] getAssetData(LLUUID assetID, bool isTexture) { | 113 | public byte[] getAssetData(LLUUID assetID, bool isTexture) { |
113 | byte[] idata = null; | 114 | byte[] idata = null; |
114 | bool found = false; | 115 | bool found = false; |
115 | AssetStorage foundAsset = null; | 116 | AssetStorage foundAsset = null; |
@@ -129,10 +130,10 @@ namespace OpenGridServices.AssetServer | |||
129 | { | 130 | { |
130 | return null; | 131 | return null; |
131 | } | 132 | } |
132 | } | 133 | } |
133 | 134 | ||
134 | public void setupDB() { | 135 | public void setupDB() { |
135 | bool yapfile=System.IO.File.Exists("assets.yap"); | 136 | bool yapfile=System.IO.File.Exists("assets.yap"); |
136 | try | 137 | try |
137 | { | 138 | { |
138 | db = Db4oFactory.OpenFile("assets.yap"); | 139 | db = Db4oFactory.OpenFile("assets.yap"); |
@@ -148,9 +149,9 @@ namespace OpenGridServices.AssetServer | |||
148 | { | 149 | { |
149 | this.LoadDB(); | 150 | this.LoadDB(); |
150 | } | 151 | } |
151 | } | 152 | } |
152 | 153 | ||
153 | public void LoadDB() { | 154 | public void LoadDB() { |
154 | try | 155 | try |
155 | { | 156 | { |
156 | 157 | ||
@@ -236,9 +237,9 @@ namespace OpenGridServices.AssetServer | |||
236 | catch (Exception e) | 237 | catch (Exception e) |
237 | { | 238 | { |
238 | Console.WriteLine(e.Message); | 239 | Console.WriteLine(e.Message); |
239 | } | 240 | } |
240 | } | 241 | } |
241 | 242 | ||
242 | private void LoadAsset(AssetBase info, bool image, string filename) | 243 | private void LoadAsset(AssetBase info, bool image, string filename) |
243 | { | 244 | { |
244 | 245 | ||
@@ -255,8 +256,8 @@ namespace OpenGridServices.AssetServer | |||
255 | fStream.Close(); | 256 | fStream.Close(); |
256 | info.Data = idata; | 257 | info.Data = idata; |
257 | //info.loaded=true; | 258 | //info.loaded=true; |
258 | } | 259 | } |
259 | 260 | ||
260 | /*private GridConfig LoadConfigDll(string dllName) | 261 | /*private GridConfig LoadConfigDll(string dllName) |
261 | { | 262 | { |
262 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); | 263 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); |
diff --git a/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj new file mode 100644 index 0000000..0392d9f --- /dev/null +++ b/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj | |||
@@ -0,0 +1,129 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <ProjectType>Local</ProjectType> | ||
4 | <ProductVersion>8.0.50727</ProductVersion> | ||
5 | <SchemaVersion>2.0</SchemaVersion> | ||
6 | <ProjectGuid>{0021261B-0000-0000-0000-000000000000}</ProjectGuid> | ||
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
9 | <ApplicationIcon></ApplicationIcon> | ||
10 | <AssemblyKeyContainerName> | ||
11 | </AssemblyKeyContainerName> | ||
12 | <AssemblyName>OpenGridServices.AssetServer</AssemblyName> | ||
13 | <DefaultClientScript>JScript</DefaultClientScript> | ||
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | ||
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | ||
16 | <DelaySign>false</DelaySign> | ||
17 | <OutputType>Exe</OutputType> | ||
18 | <AppDesignerFolder></AppDesignerFolder> | ||
19 | <RootNamespace>OpenGridServices.AssetServer</RootNamespace> | ||
20 | <StartupObject></StartupObject> | ||
21 | <FileUpgradeFlags> | ||
22 | </FileUpgradeFlags> | ||
23 | </PropertyGroup> | ||
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | ||
26 | <BaseAddress>285212672</BaseAddress> | ||
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
28 | <ConfigurationOverrideFile> | ||
29 | </ConfigurationOverrideFile> | ||
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | ||
31 | <DocumentationFile></DocumentationFile> | ||
32 | <DebugSymbols>True</DebugSymbols> | ||
33 | <FileAlignment>4096</FileAlignment> | ||
34 | <Optimize>False</Optimize> | ||
35 | <OutputPath>..\bin\</OutputPath> | ||
36 | <RegisterForComInterop>False</RegisterForComInterop> | ||
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
39 | <WarningLevel>4</WarningLevel> | ||
40 | <NoWarn></NoWarn> | ||
41 | </PropertyGroup> | ||
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | ||
44 | <BaseAddress>285212672</BaseAddress> | ||
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
46 | <ConfigurationOverrideFile> | ||
47 | </ConfigurationOverrideFile> | ||
48 | <DefineConstants>TRACE</DefineConstants> | ||
49 | <DocumentationFile></DocumentationFile> | ||
50 | <DebugSymbols>False</DebugSymbols> | ||
51 | <FileAlignment>4096</FileAlignment> | ||
52 | <Optimize>True</Optimize> | ||
53 | <OutputPath>..\bin\</OutputPath> | ||
54 | <RegisterForComInterop>False</RegisterForComInterop> | ||
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
57 | <WarningLevel>4</WarningLevel> | ||
58 | <NoWarn></NoWarn> | ||
59 | </PropertyGroup> | ||
60 | <ItemGroup> | ||
61 | <Reference Include="System" > | ||
62 | <HintPath>System.dll</HintPath> | ||
63 | <Private>False</Private> | ||
64 | </Reference> | ||
65 | <Reference Include="System.Data" > | ||
66 | <HintPath>System.Data.dll</HintPath> | ||
67 | <Private>False</Private> | ||
68 | </Reference> | ||
69 | <Reference Include="System.Xml" > | ||
70 | <HintPath>System.Xml.dll</HintPath> | ||
71 | <Private>False</Private> | ||
72 | </Reference> | ||
73 | <Reference Include="libsecondlife.dll" > | ||
74 | <HintPath>..\bin\libsecondlife.dll</HintPath> | ||
75 | <Private>False</Private> | ||
76 | </Reference> | ||
77 | <Reference Include="Db4objects.Db4o.dll" > | ||
78 | <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> | ||
79 | <Private>False</Private> | ||
80 | </Reference> | ||
81 | </ItemGroup> | ||
82 | <ItemGroup> | ||
83 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | ||
84 | <Name>OpenSim.Framework</Name> | ||
85 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
87 | <Private>False</Private> | ||
88 | </ProjectReference> | ||
89 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | ||
90 | <Name>OpenSim.Framework.Console</Name> | ||
91 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | ||
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
93 | <Private>False</Private> | ||
94 | </ProjectReference> | ||
95 | <ProjectReference Include="..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj"> | ||
96 | <Name>OpenSim.GridInterfaces.Local</Name> | ||
97 | <Project>{546099CD-0000-0000-0000-000000000000}</Project> | ||
98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
99 | <Private>False</Private> | ||
100 | </ProjectReference> | ||
101 | <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj"> | ||
102 | <Name>OpenSim.Servers</Name> | ||
103 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | ||
104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
105 | <Private>False</Private> | ||
106 | </ProjectReference> | ||
107 | <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> | ||
108 | <Name>XMLRPC</Name> | ||
109 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | ||
110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
111 | <Private>False</Private> | ||
112 | </ProjectReference> | ||
113 | </ItemGroup> | ||
114 | <ItemGroup> | ||
115 | <Compile Include="Main.cs"> | ||
116 | <SubType>Code</SubType> | ||
117 | </Compile> | ||
118 | <Compile Include="Properties\AssemblyInfo.cs"> | ||
119 | <SubType>Code</SubType> | ||
120 | </Compile> | ||
121 | </ItemGroup> | ||
122 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | ||
123 | <PropertyGroup> | ||
124 | <PreBuildEvent> | ||
125 | </PreBuildEvent> | ||
126 | <PostBuildEvent> | ||
127 | </PostBuildEvent> | ||
128 | </PropertyGroup> | ||
129 | </Project> | ||
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj index 0061140..046443e 100644 --- a/OpenSim.Framework/OpenSim.Framework.csproj +++ b/OpenSim.Framework/OpenSim.Framework.csproj | |||
@@ -96,6 +96,9 @@ | |||
96 | <Compile Include="LoginService.cs"> | 96 | <Compile Include="LoginService.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="Remoting.cs"> | ||
100 | <SubType>Code</SubType> | ||
101 | </Compile> | ||
99 | <Compile Include="SimProfile.cs"> | 102 | <Compile Include="SimProfile.cs"> |
100 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
101 | </Compile> | 104 | </Compile> |
@@ -159,6 +162,9 @@ | |||
159 | <Compile Include="Types\AssetBase.cs"> | 162 | <Compile Include="Types\AssetBase.cs"> |
160 | <SubType>Code</SubType> | 163 | <SubType>Code</SubType> |
161 | </Compile> | 164 | </Compile> |
165 | <Compile Include="Types\AssetStorage.cs"> | ||
166 | <SubType>Code</SubType> | ||
167 | </Compile> | ||
162 | <Compile Include="Types\Login.cs"> | 168 | <Compile Include="Types\Login.cs"> |
163 | <SubType>Code</SubType> | 169 | <SubType>Code</SubType> |
164 | </Compile> | 170 | </Compile> |
diff --git a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs index 436b148..2c94ac1 100644 --- a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs +++ b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs | |||
@@ -62,7 +62,7 @@ namespace OpenSim.GridInterfaces.Remote | |||
62 | { | 62 | { |
63 | while (true) | 63 | while (true) |
64 | { | 64 | { |
65 | //we need to add support for the asset server not knowing about a requested asset | 65 | //we need to add support for the asset server not knowing about a requested asset |
66 | // 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM | 66 | // 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM |
67 | ARequest req = this._assetRequests.Dequeue(); | 67 | ARequest req = this._assetRequests.Dequeue(); |
68 | LLUUID assetID = req.AssetID; | 68 | LLUUID assetID = req.AssetID; |
diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs index 071ea63..cdf49c5 100644 --- a/OpenSim.RegionServer/AgentAssetUpload.cs +++ b/OpenSim.RegionServer/AgentAssetUpload.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim | |||
70 | 70 | ||
71 | public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID) | 71 | public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID) |
72 | { | 72 | { |
73 | Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString()); | 73 | // Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString()); |
74 | AssetBase asset = null; | 74 | AssetBase asset = null; |
75 | if (pack.AssetBlock.Type == 0) | 75 | if (pack.AssetBlock.Type == 0) |
76 | { | 76 | { |
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; |
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim.RegionServer/world/Primitive2.cs index 24fc6da..c0d6295 100644 --- a/OpenSim.RegionServer/world/Primitive2.cs +++ b/OpenSim.RegionServer/world/Primitive2.cs | |||
@@ -145,6 +145,35 @@ namespace OpenSim.world | |||
145 | 145 | ||
146 | } | 146 | } |
147 | 147 | ||
148 | public void GetProperites(SimClient client) | ||
149 | { | ||
150 | ObjectPropertiesPacket proper = new ObjectPropertiesPacket(); | ||
151 | proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1]; | ||
152 | proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock(); | ||
153 | proper.ObjectData[0].ItemID = LLUUID.Zero; | ||
154 | proper.ObjectData[0].CreationDate = (ulong)this.primData.CreationDate; | ||
155 | proper.ObjectData[0].CreatorID = this.primData.OwnerID; | ||
156 | proper.ObjectData[0].FolderID = LLUUID.Zero; | ||
157 | proper.ObjectData[0].FromTaskID = LLUUID.Zero; | ||
158 | proper.ObjectData[0].GroupID = LLUUID.Zero; | ||
159 | proper.ObjectData[0].InventorySerial = 0; | ||
160 | proper.ObjectData[0].LastOwnerID = LLUUID.Zero; | ||
161 | proper.ObjectData[0].ObjectID = this.uuid; | ||
162 | proper.ObjectData[0].OwnerID = primData.OwnerID; | ||
163 | proper.ObjectData[0].TouchName = new byte[0]; | ||
164 | proper.ObjectData[0].TextureID = new byte[0]; | ||
165 | proper.ObjectData[0].SitName = new byte[0]; | ||
166 | proper.ObjectData[0].Name = new byte[0]; | ||
167 | proper.ObjectData[0].Description = new byte[0]; | ||
168 | proper.ObjectData[0].OwnerMask = this.primData.OwnerMask; | ||
169 | proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask; | ||
170 | proper.ObjectData[0].GroupMask = this.primData.GroupMask; | ||
171 | proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask; | ||
172 | proper.ObjectData[0].BaseMask = this.primData.BaseMask; | ||
173 | |||
174 | client.OutPacket(proper); | ||
175 | } | ||
176 | |||
148 | #endregion | 177 | #endregion |
149 | 178 | ||
150 | # region Inventory Methods | 179 | # region Inventory Methods |
@@ -291,6 +320,11 @@ namespace OpenSim.world | |||
291 | 320 | ||
292 | public void CreateFromPrimData(PrimData primData) | 321 | public void CreateFromPrimData(PrimData primData) |
293 | { | 322 | { |
323 | this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false); | ||
324 | } | ||
325 | |||
326 | public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim) | ||
327 | { | ||
294 | 328 | ||
295 | } | 329 | } |
296 | 330 | ||
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs index 5443d38..0ae4ae2 100644 --- a/OpenSim.RegionServer/world/World.cs +++ b/OpenSim.RegionServer/world/World.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.world | |||
72 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap"); | 72 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap"); |
73 | TerrainManager = new TerrainManager(new SecondLife()); | 73 | TerrainManager = new TerrainManager(new SecondLife()); |
74 | Terrain = new TerrainEngine(); | 74 | Terrain = new TerrainEngine(); |
75 | Avatar.SetupTemplate("avatar-template2.dat"); | 75 | Avatar.SetupTemplate("avatar-texture.dat"); |
76 | // MainConsole.Instance.WriteLine("World.cs - Creating script engine instance"); | 76 | // MainConsole.Instance.WriteLine("World.cs - Creating script engine instance"); |
77 | // Initialise this only after the world has loaded | 77 | // Initialise this only after the world has loaded |
78 | // Scripts = new ScriptEngine(this); | 78 | // Scripts = new ScriptEngine(this); |
diff --git a/OpenSim.sln b/OpenSim.sln index 8bb883d..1939c8f 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -1,45 +1,49 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual C# Express 2005 | 2 | # Visual C# Express 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" |
4 | EndProject | ||
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}" | ||
4 | EndProject | 6 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}" | 7 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}" |
6 | EndProject | 8 | EndProject |
7 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" | 9 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" |
8 | EndProject | 10 | EndProject |
9 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}" | ||
10 | EndProject | ||
11 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" | 11 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" |
12 | EndProject | 12 | EndProject |
13 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GenericConfig.Xml", "OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj", "{E88EF749-0000-0000-0000-000000000000}" | 13 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}" |
14 | EndProject | ||
15 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}" | ||
14 | EndProject | 16 | EndProject |
15 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{8BE16150-0000-0000-0000-000000000000}" | 17 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{8BE16150-0000-0000-0000-000000000000}" |
16 | EndProject | 18 | EndProject |
19 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GenericConfig.Xml", "OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj", "{E88EF749-0000-0000-0000-000000000000}" | ||
20 | EndProject | ||
17 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{66591469-0000-0000-0000-000000000000}" | 21 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{66591469-0000-0000-0000-000000000000}" |
18 | EndProject | 22 | EndProject |
19 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{4F874463-0000-0000-0000-000000000000}" | 23 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{4F874463-0000-0000-0000-000000000000}" |
20 | EndProject | 24 | EndProject |
21 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}" | 25 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}" |
22 | EndProject | 26 | EndProject |
23 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "OpenSim.Servers\OpenSim.Servers.csproj", "{8BB20F0A-0000-0000-0000-000000000000}" | ||
24 | EndProject | ||
25 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{988F0AC4-0000-0000-0000-000000000000}" | 27 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{988F0AC4-0000-0000-0000-000000000000}" |
26 | EndProject | 28 | EndProject |
27 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B55C0B5D-0000-0000-0000-000000000000}" | 29 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B55C0B5D-0000-0000-0000-000000000000}" |
28 | EndProject | 30 | EndProject |
29 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}" | 31 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}" |
30 | EndProject | 32 | EndProject |
31 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}" | 33 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "OpenSim.Servers\OpenSim.Servers.csproj", "{8BB20F0A-0000-0000-0000-000000000000}" |
32 | EndProject | 34 | EndProject |
33 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{E1B79ECF-0000-0000-0000-000000000000}" | 35 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{E1B79ECF-0000-0000-0000-000000000000}" |
34 | EndProject | 36 | EndProject |
35 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageSQLite", "OpenSim.Storage\LocalStorageSQLite\OpenSim.Storage.LocalStorageSQLite.csproj", "{6B20B603-0000-0000-0000-000000000000}" | 37 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageSQLite", "OpenSim.Storage\LocalStorageSQLite\OpenSim.Storage.LocalStorageSQLite.csproj", "{6B20B603-0000-0000-0000-000000000000}" |
36 | EndProject | 38 | EndProject |
37 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}" | ||
38 | EndProject | ||
39 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Scripting.EmbeddedJVM", "OpenSim.Scripting\EmbeddedJVM\OpenSim.Scripting.EmbeddedJVM.csproj", "{97A82740-0000-0000-0000-000000000000}" | 39 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Scripting.EmbeddedJVM", "OpenSim.Scripting\EmbeddedJVM\OpenSim.Scripting.EmbeddedJVM.csproj", "{97A82740-0000-0000-0000-000000000000}" |
40 | EndProject | 40 | EndProject |
41 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}" | ||
42 | EndProject | ||
41 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{546099CD-0000-0000-0000-000000000000}" | 43 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{546099CD-0000-0000-0000-000000000000}" |
42 | EndProject | 44 | EndProject |
45 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}" | ||
46 | EndProject | ||
43 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" | 47 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" |
44 | EndProject | 48 | EndProject |
45 | Global | 49 | Global |
@@ -48,10 +52,14 @@ Global | |||
48 | Release|Any CPU = Release|Any CPU | 52 | Release|Any CPU = Release|Any CPU |
49 | EndGlobalSection | 53 | EndGlobalSection |
50 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 54 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
51 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 55 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
52 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 56 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
53 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 57 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
54 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 58 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
59 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
60 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
61 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
62 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
55 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 63 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
56 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 64 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
57 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 65 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
@@ -60,22 +68,26 @@ Global | |||
60 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 68 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
61 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 69 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
62 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 70 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
63 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
64 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
65 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
66 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
67 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 71 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
68 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 72 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
69 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 73 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
70 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 74 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
71 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 75 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
72 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 76 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
73 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 77 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
74 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 78 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
79 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
80 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
81 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
82 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
75 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 83 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
76 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 84 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
77 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 85 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
78 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 86 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
87 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
88 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
89 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
90 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
79 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 91 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
80 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 92 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
81 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 93 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
@@ -88,10 +100,6 @@ Global | |||
88 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 100 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
89 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 101 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
90 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 102 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
91 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
92 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
93 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
94 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
95 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 103 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
96 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 104 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
97 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 105 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
@@ -104,10 +112,10 @@ Global | |||
104 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 112 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
105 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 113 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
106 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 114 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
107 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 115 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
108 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 116 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
109 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 117 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
110 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 118 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
111 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 119 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
112 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 120 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
113 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 121 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
@@ -116,18 +124,22 @@ Global | |||
116 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 124 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
117 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 125 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
118 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 126 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
119 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
120 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
121 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
122 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
123 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 127 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
124 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 128 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
125 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 129 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
126 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 130 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
131 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
132 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
133 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
134 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
127 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 135 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
128 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 136 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
129 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 137 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
130 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 138 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
139 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
140 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
141 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
142 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
131 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 143 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
132 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 144 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
133 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 145 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
diff --git a/bin/avatar-texture.dat b/bin/avatar-texture.dat new file mode 100644 index 0000000..6548a8a --- /dev/null +++ b/bin/avatar-texture.dat | |||
Binary files differ | |||