aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs2
-rw-r--r--OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs7
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs12
3 files changed, 7 insertions, 14 deletions
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index a5fb636..c405042 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -244,7 +244,7 @@ namespace OpenSim.GridInterfaces.Local
244 } 244 }
245 catch (Exception e) 245 catch (Exception e)
246 { 246 {
247 Console.WriteLine(e.Message); 247 MainConsole.Instance.Error(e.Message);
248 } 248 }
249 249
250 } 250 }
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
index c66c148..770ae45 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
@@ -20,11 +20,8 @@ namespace OpenSim.Scripting.EmbeddedJVM
20 { 20 {
21 case 184: 21 case 184:
22 short refIndex = (short) ((GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC+1]); 22 short refIndex = (short) ((GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC+1]);
23 //Console.WriteLine("call to method : "+refIndex);
24 if (this._mThread.currentClass._constantsPool[refIndex - 1] is ClassRecord.PoolMethodRef) 23 if (this._mThread.currentClass._constantsPool[refIndex - 1] is ClassRecord.PoolMethodRef)
25 { 24 {
26 // Console.WriteLine("which is " + ((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mClass.Name.Value + "." + ((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mNameType.Name.Value);
27 // Console.WriteLine("of type " + ((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mNameType.Type.Value);
28 string typ = ((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mNameType.Type.Value; 25 string typ = ((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mNameType.Type.Value;
29 string typeparam = ""; 26 string typeparam = "";
30 string typereturn = ""; 27 string typereturn = "";
@@ -34,7 +31,6 @@ namespace OpenSim.Scripting.EmbeddedJVM
34 secondbrak = typ.LastIndexOf(')'); 31 secondbrak = typ.LastIndexOf(')');
35 typeparam = typ.Substring(firstbrak + 1, secondbrak - firstbrak - 1); 32 typeparam = typ.Substring(firstbrak + 1, secondbrak - firstbrak - 1);
36 typereturn = typ.Substring(secondbrak + 1, typ.Length - secondbrak - 1); 33 typereturn = typ.Substring(secondbrak + 1, typ.Length - secondbrak - 1);
37 //Console.WriteLine("split is " + typeparam + " which is length " + typeparam.Length + " , " + typereturn);
38 if (((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mClass.Name.Value == this._mThread.currentClass.mClass.Name.Value) 34 if (((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mClass.Name.Value == this._mThread.currentClass.mClass.Name.Value)
39 { 35 {
40 //calling a method in this class 36 //calling a method in this class
@@ -72,12 +68,10 @@ namespace OpenSim.Scripting.EmbeddedJVM
72 BaseType bs1 = this._mThread.currentFrame.OpStack.Pop(); 68 BaseType bs1 = this._mThread.currentFrame.OpStack.Pop();
73 if (bs1 is Int) 69 if (bs1 is Int)
74 { 70 {
75 //Console.WriteLine("get entity pos for " + ((Int)bs1).mValue);
76 //should get the position of the entity from the IScriptAPI 71 //should get the position of the entity from the IScriptAPI
77 OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue); 72 OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue);
78 Float pos = new Float(); 73 Float pos = new Float();
79 pos.mValue = vec3.X; 74 pos.mValue = vec3.X;
80 // Console.WriteLine("returned x value " + vec3.X.ToString());
81 this._mThread.currentFrame.OpStack.Push(pos); 75 this._mThread.currentFrame.OpStack.Push(pos);
82 } 76 }
83 this._mThread.PC += 2; 77 this._mThread.PC += 2;
@@ -116,7 +110,6 @@ namespace OpenSim.Scripting.EmbeddedJVM
116 { 110 {
117 if(in1 is Int) 111 if(in1 is Int)
118 { 112 {
119 //Console.WriteLine("set: " + ((Int)in1).mValue + " , " + ((Float)ft1).mValue + " , " + ((Float)ft2).mValue + " , " + ((Float)ft3).mValue);
120 Thread.OpenSimScriptAPI.SetEntityPosition((uint)((Int) in1).mValue, ((Float)ft1).mValue, ((Float)ft2).mValue, ((Float)ft3).mValue); 113 Thread.OpenSimScriptAPI.SetEntityPosition((uint)((Int) in1).mValue, ((Float)ft1).mValue, ((Float)ft2).mValue, ((Float)ft3).mValue);
121 } 114 }
122 } 115 }
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index b462aac..38ee74f 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -208,10 +208,10 @@ namespace OpenSim
208 m_console.Notice("Main.cs:Startup() - Grid Mode; Do not know how to get the user's master key yet!"); 208 m_console.Notice("Main.cs:Startup() - Grid Mode; Do not know how to get the user's master key yet!");
209 } 209 }
210 210
211 Console.WriteLine("Creating ParcelManager"); 211 m_console.Notice("Creating ParcelManager");
212 LocalWorld.parcelManager = new OpenSim.RegionServer.world.ParcelManager(this.LocalWorld); 212 LocalWorld.parcelManager = new OpenSim.RegionServer.world.ParcelManager(this.LocalWorld);
213 213
214 Console.WriteLine("Loading Parcels from DB..."); 214 m_console.Notice("Loading Parcels from DB...");
215 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager); 215 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
216 216
217 m_heartbeatTimer.Enabled = true; 217 m_heartbeatTimer.Enabled = true;
@@ -359,7 +359,7 @@ namespace OpenSim
359 } 359 }
360 catch (Exception e) 360 catch (Exception e)
361 { 361 {
362 m_console.Error(e.Message + "\nBAD ERROR! THIS SHOULD NOT HAPPEN! Bad GridData from the grid interface!!!! ZOMG!!!"); 362 m_console.Error("Did not recieve valid information from the grid server. " + e.ToString());
363 Environment.Exit(1); 363 Environment.Exit(1);
364 } 364 }
365 } 365 }
@@ -460,9 +460,9 @@ namespace OpenSim
460 } 460 }
461 catch (Exception e) 461 catch (Exception e)
462 { 462 {
463 Console.WriteLine(e.Message); 463 m_console.Error(e.Message);
464 Console.WriteLine("\nSorry, a fatal error occurred while trying to initialise the configuration data"); 464 m_console.Error("Sorry, a fatal error occurred while trying to initialise the configuration data");
465 Console.WriteLine("Can not continue starting up"); 465 m_console.Error("Can not continue starting up");
466 Environment.Exit(1); 466 Environment.Exit(1);
467 } 467 }
468 } 468 }