1 files changed, 85 insertions, 45 deletions
diff --git a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index 6cd954a..fc0ba4a 100644
--- a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -137,52 +137,92 @@ namespace OpenSim.GridInterfaces.Local
        private void SetUpAssetDatabase()
        {
-            Console.WriteLine("setting up Asset database");
+            try
+            {
-            AssetBase Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
-            Image.Name = "test Texture";
-            this.LoadAsset(Image, true, "testpic2.jp2");
-            AssetStorage store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002");
-            Image.Name = "test Texture2";
-            this.LoadAsset(Image, true, "map_base.jp2");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005");
-            Image.Name = "Prim Base Texture";
-            this.LoadAsset(Image, true, "testpic2.jp2");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
-            Image = new AssetBase();
-            Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
-            Image.Name = "Shape";
-            this.LoadAsset(Image, false, "base_shape.dat");
-            store = new AssetStorage();
-            store.Data = Image.Data;
-            store.Name = Image.Name;
-            store.UUID = Image.FullID;
-            db.Set(store);
-            db.Commit();
+                Console.WriteLine("setting up Asset database");
+                AssetBase Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
+                Image.Name = "Bricks";
+                this.LoadAsset(Image, true, "bricks.jp2");
+                AssetStorage store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002");
+                Image.Name = "Plywood";
+                this.LoadAsset(Image, true, "plywood.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000003");
+                Image.Name = "Rocks";
+                this.LoadAsset(Image, true, "rocks.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000004");
+                Image.Name = "Granite";
+                this.LoadAsset(Image, true, "granite.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000005");
+                Image.Name = "Hardwood";
+                this.LoadAsset(Image, true, "hardwood.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005");
+                Image.Name = "Prim Base Texture";
+                this.LoadAsset(Image, true, "plywood.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
+                Image.Name = "Shape";
+                this.LoadAsset(Image, false, "base_shape.dat");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.Message);
+            }
        }

diff --git a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs index 6cd954a..fc0ba4a 100644 --- a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs +++ b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -137,52 +137,92 @@ namespace OpenSim.GridInterfaces.Local
137		137
138	private void SetUpAssetDatabase()	138	private void SetUpAssetDatabase()
139	{	139	{
140	Console.WriteLine("setting up Asset database");	140	try
141		141	{
142	AssetBase Image = new AssetBase();
143	Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
144	Image.Name = "test Texture";
145	this.LoadAsset(Image, true, "testpic2.jp2");
146	AssetStorage store = new AssetStorage();
147	store.Data = Image.Data;
148	store.Name = Image.Name;
149	store.UUID = Image.FullID;
150	db.Set(store);
151	db.Commit();
152
153	Image = new AssetBase();
154	Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002");
155	Image.Name = "test Texture2";
156	this.LoadAsset(Image, true, "map_base.jp2");
157	store = new AssetStorage();
158	store.Data = Image.Data;
159	store.Name = Image.Name;
160	store.UUID = Image.FullID;
161	db.Set(store);
162	db.Commit();
163
164	Image = new AssetBase();
165	Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005");
166	Image.Name = "Prim Base Texture";
167	this.LoadAsset(Image, true, "testpic2.jp2");
168	store = new AssetStorage();
169	store.Data = Image.Data;
170	store.Name = Image.Name;
171	store.UUID = Image.FullID;
172	db.Set(store);
173	db.Commit();
174
175	Image = new AssetBase();
176	Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
177	Image.Name = "Shape";
178	this.LoadAsset(Image, false, "base_shape.dat");
179	store = new AssetStorage();
180	store.Data = Image.Data;
181	store.Name = Image.Name;
182	store.UUID = Image.FullID;
183	db.Set(store);
184	db.Commit();
185		142
		143	Console.WriteLine("setting up Asset database");
		144
		145	AssetBase Image = new AssetBase();
		146	Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
		147	Image.Name = "Bricks";
		148	this.LoadAsset(Image, true, "bricks.jp2");
		149	AssetStorage store = new AssetStorage();
		150	store.Data = Image.Data;
		151	store.Name = Image.Name;
		152	store.UUID = Image.FullID;
		153	db.Set(store);
		154	db.Commit();
		155
		156	Image = new AssetBase();
		157	Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000002");
		158	Image.Name = "Plywood";
		159	this.LoadAsset(Image, true, "plywood.jp2");
		160	store = new AssetStorage();
		161	store.Data = Image.Data;
		162	store.Name = Image.Name;
		163	store.UUID = Image.FullID;
		164	db.Set(store);
		165	db.Commit();
		166
		167	Image = new AssetBase();
		168	Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000003");
		169	Image.Name = "Rocks";
		170	this.LoadAsset(Image, true, "rocks.jp2");
		171	store = new AssetStorage();
		172	store.Data = Image.Data;
		173	store.Name = Image.Name;
		174	store.UUID = Image.FullID;
		175	db.Set(store);
		176	db.Commit();
		177
		178	Image = new AssetBase();
		179	Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000004");
		180	Image.Name = "Granite";
		181	this.LoadAsset(Image, true, "granite.jp2");
		182	store = new AssetStorage();
		183	store.Data = Image.Data;
		184	store.Name = Image.Name;
		185	store.UUID = Image.FullID;
		186	db.Set(store);
		187	db.Commit();
		188
		189	Image = new AssetBase();
		190	Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000005");
		191	Image.Name = "Hardwood";
		192	this.LoadAsset(Image, true, "hardwood.jp2");
		193	store = new AssetStorage();
		194	store.Data = Image.Data;
		195	store.Name = Image.Name;
		196	store.UUID = Image.FullID;
		197	db.Set(store);
		198	db.Commit();
		199
		200	Image = new AssetBase();
		201	Image.FullID = new LLUUID("00000000-0000-0000-5005-000000000005");
		202	Image.Name = "Prim Base Texture";
		203	this.LoadAsset(Image, true, "plywood.jp2");
		204	store = new AssetStorage();
		205	store.Data = Image.Data;
		206	store.Name = Image.Name;
		207	store.UUID = Image.FullID;
		208	db.Set(store);
		209	db.Commit();
		210
		211	Image = new AssetBase();
		212	Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
		213	Image.Name = "Shape";
		214	this.LoadAsset(Image, false, "base_shape.dat");
		215	store = new AssetStorage();
		216	store.Data = Image.Data;
		217	store.Name = Image.Name;
		218	store.UUID = Image.FullID;
		219	db.Set(store);
		220	db.Commit();
		221	}
		222	catch (Exception e)
		223	{
		224	Console.WriteLine(e.Message);
		225	}
186		226
187	}	227	}
188		228