aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorgareth2007-03-13 09:43:24 +0000
committergareth2007-03-13 09:43:24 +0000
commitf9ea1513d2f9eac0be12e8778abb460873b62563 (patch)
tree66855dbdfc6e9a98697e5d2bdf1bf03f7dd823ad
parent-- Trying to get trunk to run from first build (diff)
downloadopensim-SC_OLD-f9ea1513d2f9eac0be12e8778abb460873b62563.zip
opensim-SC_OLD-f9ea1513d2f9eac0be12e8778abb460873b62563.tar.gz
opensim-SC_OLD-f9ea1513d2f9eac0be12e8778abb460873b62563.tar.bz2
opensim-SC_OLD-f9ea1513d2f9eac0be12e8778abb460873b62563.tar.xz
Rolled back all but the VS solution
Diffstat (limited to '')
-rw-r--r--src/Config/SimConfig/AssemblyInfo.cs52
-rw-r--r--src/Config/SimConfig/SimConfig.csproj2
-rw-r--r--src/GridInterfaces/AssemblyInfo.cs52
-rw-r--r--src/LocalServers/LocalGridServers/AssemblyInfo.cs52
-rw-r--r--src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs52
-rw-r--r--src/Main.cs20
-rw-r--r--src/OpenSimConsole.cs43
-rw-r--r--src/RemoteServers/RemoteGridServers/AssemblyInfo.cs52
-rw-r--r--src/RemoteServers/RemoteGridServers/RemoteGrid.cs16
-rw-r--r--src/ServerConsole/ServerConsole/AssemblyInfo.cs52
-rw-r--r--src/ServerConsole/ServerConsole/ServerConsole.cs22
-rw-r--r--src/VersionInfo.cs2
-rw-r--r--src/physics/AssemblyInfo.cs52
-rw-r--r--src/physics/PhysicsManager.cs119
-rw-r--r--src/physics/plugins/AssemblyInfo.cs52
15 files changed, 219 insertions, 421 deletions
diff --git a/src/Config/SimConfig/AssemblyInfo.cs b/src/Config/SimConfig/AssemblyInfo.cs
index 96c3e73..b205b4b 100644
--- a/src/Config/SimConfig/AssemblyInfo.cs
+++ b/src/Config/SimConfig/AssemblyInfo.cs
@@ -1,31 +1,21 @@
1using System.Reflection; 1using System;
2using System.Runtime.CompilerServices; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// Information about this assembly is defined by the following 5// ------------------------------------------------------------------------------
6// attributes. 6// <autogenerated>
7// 7// This code was generated by a tool.
8// change them to the information which is associated with the assembly 8// Mono Runtime Version: 2.0.50727.42
9// you compile. 9//
10 10// Changes to this file may cause incorrect behavior and will be lost if
11[assembly: AssemblyTitle("SimConfig")] 11// the code is regenerated.
12[assembly: AssemblyDescription("")] 12// </autogenerated>
13[assembly: AssemblyConfiguration("")] 13// ------------------------------------------------------------------------------
14[assembly: AssemblyCompany("")] 14
15[assembly: AssemblyProduct("SimConfig")] 15[assembly: ComVisibleAttribute(false)]
16[assembly: AssemblyCopyright("")] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyTrademark("")] 17[assembly: AssemblyVersionAttribute("0.1.*.191")]
18[assembly: AssemblyCulture("")] 18[assembly: AssemblyTitleAttribute("opensim-simconfig")]
19 19[assembly: AssemblyDescriptionAttribute("The default configuration handler")]
20// This sets the default COM visibility of types in the assembly to invisible. 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21// If you need to expose a type to COM, use [ComVisible(true)] on that type. 21
22[assembly: ComVisible(false)]
23
24// The assembly version has following format :
25//
26// Major.Minor.Build.Revision
27//
28// You can specify all values by your own or you can build default build and revision
29// numbers with the '*' character (the default):
30
31[assembly: AssemblyVersion("1.0.*")]
diff --git a/src/Config/SimConfig/SimConfig.csproj b/src/Config/SimConfig/SimConfig.csproj
index 5aee907..3131405 100644
--- a/src/Config/SimConfig/SimConfig.csproj
+++ b/src/Config/SimConfig/SimConfig.csproj
@@ -8,7 +8,7 @@
8 <ProjectGuid>{B063760D-DB8D-4F64-B6FE-335FAD1E650A}</ProjectGuid> 8 <ProjectGuid>{B063760D-DB8D-4F64-B6FE-335FAD1E650A}</ProjectGuid>
9 </PropertyGroup> 9 </PropertyGroup>
10 <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> 10 <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
11 <OutputPath>..\..\..\bin\</OutputPath> 11 <OutputPath>bin\Debug\</OutputPath>
12 <Optimize>False</Optimize> 12 <Optimize>False</Optimize>
13 <DefineConstants>DEBUG;TRACE</DefineConstants> 13 <DefineConstants>DEBUG;TRACE</DefineConstants>
14 <DebugSymbols>True</DebugSymbols> 14 <DebugSymbols>True</DebugSymbols>
diff --git a/src/GridInterfaces/AssemblyInfo.cs b/src/GridInterfaces/AssemblyInfo.cs
index 89731a1..9ec5236 100644
--- a/src/GridInterfaces/AssemblyInfo.cs
+++ b/src/GridInterfaces/AssemblyInfo.cs
@@ -1,31 +1,21 @@
1using System.Reflection; 1using System;
2using System.Runtime.CompilerServices; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// Information about this assembly is defined by the following 5// ------------------------------------------------------------------------------
6// attributes. 6// <autogenerated>
7// 7// This code was generated by a tool.
8// change them to the information which is associated with the assembly 8// Mono Runtime Version: 2.0.50727.42
9// you compile. 9//
10 10// Changes to this file may cause incorrect behavior and will be lost if
11[assembly: AssemblyTitle("GridInterfaces")] 11// the code is regenerated.
12[assembly: AssemblyDescription("")] 12// </autogenerated>
13[assembly: AssemblyConfiguration("")] 13// ------------------------------------------------------------------------------
14[assembly: AssemblyCompany("")] 14
15[assembly: AssemblyProduct("GridInterfaces")] 15[assembly: ComVisibleAttribute(false)]
16[assembly: AssemblyCopyright("")] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyTrademark("")] 17[assembly: AssemblyVersionAttribute("0.1.*.191")]
18[assembly: AssemblyCulture("")] 18[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
19 19[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
20// This sets the default COM visibility of types in the assembly to invisible. 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21// If you need to expose a type to COM, use [ComVisible(true)] on that type. 21
22[assembly: ComVisible(false)]
23
24// The assembly version has following format :
25//
26// Major.Minor.Build.Revision
27//
28// You can specify all values by your own or you can build default build and revision
29// numbers with the '*' character (the default):
30
31[assembly: AssemblyVersion("1.0.*")]
diff --git a/src/LocalServers/LocalGridServers/AssemblyInfo.cs b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
index 103b49a..64f467b 100644
--- a/src/LocalServers/LocalGridServers/AssemblyInfo.cs
+++ b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
@@ -1,31 +1,21 @@
1using System.Reflection; 1using System;
2using System.Runtime.CompilerServices; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// Information about this assembly is defined by the following 5// ------------------------------------------------------------------------------
6// attributes. 6// <autogenerated>
7// 7// This code was generated by a tool.
8// change them to the information which is associated with the assembly 8// Mono Runtime Version: 2.0.50727.42
9// you compile. 9//
10 10// Changes to this file may cause incorrect behavior and will be lost if
11[assembly: AssemblyTitle("LocalGridServers")] 11// the code is regenerated.
12[assembly: AssemblyDescription("")] 12// </autogenerated>
13[assembly: AssemblyConfiguration("")] 13// ------------------------------------------------------------------------------
14[assembly: AssemblyCompany("")] 14
15[assembly: AssemblyProduct("LocalGridServers")] 15[assembly: ComVisibleAttribute(false)]
16[assembly: AssemblyCopyright("")] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyTrademark("")] 17[assembly: AssemblyVersionAttribute("0.1.*.191")]
18[assembly: AssemblyCulture("")] 18[assembly: AssemblyTitleAttribute("opensim-localservers")]
19 19[assembly: AssemblyDescriptionAttribute("local grid servers")]
20// This sets the default COM visibility of types in the assembly to invisible. 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21// If you need to expose a type to COM, use [ComVisible(true)] on that type. 21
22[assembly: ComVisible(false)]
23
24// The assembly version has following format :
25//
26// Major.Minor.Build.Revision
27//
28// You can specify all values by your own or you can build default build and revision
29// numbers with the '*' character (the default):
30
31[assembly: AssemblyVersion("1.0.*")]
diff --git a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
index 6610606..dda233d 100644
--- a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
+++ b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
@@ -1,31 +1,21 @@
1using System.Reflection; 1using System;
2using System.Runtime.CompilerServices; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// Information about this assembly is defined by the following 5// ------------------------------------------------------------------------------
6// attributes. 6// <autogenerated>
7// 7// This code was generated by a tool.
8// change them to the information which is associated with the assembly 8// Mono Runtime Version: 2.0.50727.42
9// you compile. 9//
10 10// Changes to this file may cause incorrect behavior and will be lost if
11[assembly: AssemblyTitle("Db4LocalStorage")] 11// the code is regenerated.
12[assembly: AssemblyDescription("")] 12// </autogenerated>
13[assembly: AssemblyConfiguration("")] 13// ------------------------------------------------------------------------------
14[assembly: AssemblyCompany("")] 14
15[assembly: AssemblyProduct("Db4LocalStorage")] 15[assembly: ComVisibleAttribute(false)]
16[assembly: AssemblyCopyright("")] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyTrademark("")] 17[assembly: AssemblyVersionAttribute("0.1.*.191")]
18[assembly: AssemblyCulture("")] 18[assembly: AssemblyTitleAttribute("opensim-localstorage")]
19 19[assembly: AssemblyDescriptionAttribute("The local storage handler")]
20// This sets the default COM visibility of types in the assembly to invisible. 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21// If you need to expose a type to COM, use [ComVisible(true)] on that type. 21
22[assembly: ComVisible(false)]
23
24// The assembly version has following format :
25//
26// Major.Minor.Build.Revision
27//
28// You can specify all values by your own or you can build default build and revision
29// numbers with the '*' character (the default):
30
31[assembly: AssemblyVersion("1.0.*")]
diff --git a/src/Main.cs b/src/Main.cs
index 0680cbb..18418d1 100644
--- a/src/Main.cs
+++ b/src/Main.cs
@@ -71,7 +71,7 @@ namespace OpenSim
71 private PhysicsManager physManager; 71 private PhysicsManager physManager;
72 private System.Timers.Timer timer1 = new System.Timers.Timer(); 72 private System.Timers.Timer timer1 = new System.Timers.Timer();
73 private string ConfigDll = "SimConfig.dll"; 73 private string ConfigDll = "SimConfig.dll";
74 private string _physicsEngine = ""; 74 private string _physicsEngine = "PhysX";
75 public bool sandbox = false; 75 public bool sandbox = false;
76 public bool loginserver = false; 76 public bool loginserver = false;
77 77
@@ -83,18 +83,13 @@ namespace OpenSim
83 ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local,"",0); 83 ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local,"",0);
84 84
85 sim = new OpenSim_Main(); 85 sim = new OpenSim_Main();
86 86
87 sim.sandbox = false;
88 sim.loginserver = false;
89 sim._physicsEngine = "";
90
91 for (int i = 0; i < args.Length; i++) 87 for (int i = 0; i < args.Length; i++)
92 { 88 {
93 if(args[i] == "-sandbox") 89 if(args[i] == "-sandbox")
94 { 90 {
95 sim.sandbox = true; 91 sim.sandbox = true;
96 } 92 }
97
98 if(args[i] == "-loginserver") 93 if(args[i] == "-loginserver")
99 { 94 {
100 sim.loginserver = true; 95 sim.loginserver = true;
@@ -141,6 +136,9 @@ namespace OpenSim
141 136
142 private void Startup() { 137 private void Startup() {
143 startuptime=DateTime.Now; 138 startuptime=DateTime.Now;
139 timer1.Enabled = true;
140 timer1.Interval = 100;
141 timer1.Elapsed +=new ElapsedEventHandler( this.Timer1Tick );
144 142
145 // We check our local database first, then the grid for config options 143 // We check our local database first, then the grid for config options
146 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Loading configuration"); 144 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Loading configuration");
@@ -152,11 +150,7 @@ namespace OpenSim
152 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - We are " + cfg.RegionName + " at " + cfg.RegionLocX.ToString() + "," + cfg.RegionLocY.ToString()); 150 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - We are " + cfg.RegionName + " at " + cfg.RegionLocX.ToString() + "," + cfg.RegionLocY.ToString());
153 ServerConsole.MainConsole.Instance.WriteLine("Initialising world"); 151 ServerConsole.MainConsole.Instance.WriteLine("Initialising world");
154 local_world = cfg.LoadWorld(); 152 local_world = cfg.LoadWorld();
155 153
156 timer1.Enabled = true;
157 timer1.Interval = 100;
158 timer1.Elapsed += new ElapsedEventHandler(this.Timer1Tick);
159
160 this.physManager = new PhysicsSystem.PhysicsManager(); 154 this.physManager = new PhysicsSystem.PhysicsManager();
161 this.physManager.LoadPlugins(); 155 this.physManager.LoadPlugins();
162 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system"); 156 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system");
@@ -216,7 +210,7 @@ namespace OpenSim
216 OpenSimClient newuser = new OpenSimClient(epSender,(UseCircuitCodePacket)packet); 210 OpenSimClient newuser = new OpenSimClient(epSender,(UseCircuitCodePacket)packet);
217 ClientThreads.Add(epSender, newuser); 211 ClientThreads.Add(epSender, newuser);
218 } else { // invalid client 212 } else { // invalid client
219 Console.Error.WriteLine("Main.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString()); 213 Console.Error.WriteLine("Main.cs:OnReceivedData() - WARNING: Got a " + packet.ToString() + " packet from an invalid client - " + epSender.ToString());
220 } 214 }
221 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); 215 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
222 } 216 }
diff --git a/src/OpenSimConsole.cs b/src/OpenSimConsole.cs
index 00a4cee..11bc648 100644
--- a/src/OpenSimConsole.cs
+++ b/src/OpenSimConsole.cs
@@ -61,7 +61,6 @@ namespace OpenSim
61 ConsType = constype; 61 ConsType = constype;
62 switch(constype) { 62 switch(constype) {
63 case ConsoleType.Local: 63 case ConsoleType.Local:
64
65 Console.WriteLine("ServerConsole.cs - creating new local console"); 64 Console.WriteLine("ServerConsole.cs - creating new local console");
66 Console.WriteLine("Logs will be saved to current directory in opensim-console.log"); 65 Console.WriteLine("Logs will be saved to current directory in opensim-console.log");
67 Log=File.AppendText("opensim-console.log"); 66 Log=File.AppendText("opensim-console.log");
@@ -76,30 +75,22 @@ namespace OpenSim
76 default: 75 default:
77 Console.WriteLine("ServerConsole.cs - what are you smoking? that isn't a valid console type!"); 76 Console.WriteLine("ServerConsole.cs - what are you smoking? that isn't a valid console type!");
78 break; 77 break;
79 } 78 }
80 } 79 }
81 80
82 public override void Close() { 81 public override void Close() {
83 Log.WriteLine("OpenSim shutdown at " + DateTime.Now.ToString()); 82 Log.WriteLine("OpenSim shutdown at " + DateTime.Now.ToString());
84 Log.Close(); 83 Log.Close();
85 } 84 }
86 85
87 public override void Write(string format, params object[] args) 86 // You know what ReadLine() and WriteLine() do, right? And Read() and Write()? Right, you do actually know C#, right? Are you actually a programmer? Do you know english? Do you find my sense of humour in comments irritating? Good, glad you're still here
88 { 87 public override void WriteLine(string Line) {
89 Log.Write(format, args); 88 Log.WriteLine(Line);
90 Console.Write(format, args); 89 Console.WriteLine(Line);
91 return; 90 return;
92 } 91 }
93 92
94 public override void WriteLine(string format, params object[] args) 93 public override string ReadLine() {
95 {
96 Log.WriteLine(format, args);
97 Console.WriteLine(format, args);
98 return;
99 }
100
101 public override string ReadLine()
102 {
103 string TempStr=Console.ReadLine(); 94 string TempStr=Console.ReadLine();
104 Log.WriteLine(TempStr); 95 Log.WriteLine(TempStr);
105 return TempStr; 96 return TempStr;
@@ -111,6 +102,12 @@ namespace OpenSim
111 return TempInt; 102 return TempInt;
112 } 103 }
113 104
105 public override void Write(string Line) {
106 Console.Write(Line);
107 Log.Write(Line);
108 return;
109 }
110
114 // Displays a command prompt and waits for the user to enter a string, then returns that string 111 // Displays a command prompt and waits for the user to enter a string, then returns that string
115 public override string CmdPrompt(string prompt) { 112 public override string CmdPrompt(string prompt) {
116 this.Write(prompt); 113 this.Write(prompt);
@@ -199,13 +196,7 @@ namespace OpenSim
199 string[] cmdparams=(string[])tempstrarray; 196 string[] cmdparams=(string[])tempstrarray;
200 RunCmd(cmd,cmdparams); 197 RunCmd(cmd,cmdparams);
201 } 198 }
202 199 }
203
204 public override void SetStatus(string status)
205 {
206 Console.Write( status + "\r" );
207 }
208 }
209} 200}
210 201
211 202
diff --git a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
index 0fa7d6e..21d481a 100644
--- a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
+++ b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
@@ -1,31 +1,21 @@
1using System.Reflection; 1using System;
2using System.Runtime.CompilerServices; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// Information about this assembly is defined by the following 5// ------------------------------------------------------------------------------
6// attributes. 6// <autogenerated>
7// 7// This code was generated by a tool.
8// change them to the information which is associated with the assembly 8// Mono Runtime Version: 2.0.50727.42
9// you compile. 9//
10 10// Changes to this file may cause incorrect behavior and will be lost if
11[assembly: AssemblyTitle("RemoteGridServers")] 11// the code is regenerated.
12[assembly: AssemblyDescription("")] 12// </autogenerated>
13[assembly: AssemblyConfiguration("")] 13// ------------------------------------------------------------------------------
14[assembly: AssemblyCompany("")] 14
15[assembly: AssemblyProduct("RemoteGridServers")] 15[assembly: ComVisibleAttribute(false)]
16[assembly: AssemblyCopyright("")] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyTrademark("")] 17[assembly: AssemblyVersionAttribute("0.1.*.191")]
18[assembly: AssemblyCulture("")] 18[assembly: AssemblyTitleAttribute("opensim-remoteservers")]
19 19[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")]
20// This sets the default COM visibility of types in the assembly to invisible. 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21// If you need to expose a type to COM, use [ComVisible(true)] on that type. 21
22[assembly: ComVisible(false)]
23
24// The assembly version has following format :
25//
26// Major.Minor.Build.Revision
27//
28// You can specify all values by your own or you can build default build and revision
29// numbers with the '*' character (the default):
30
31[assembly: AssemblyVersion("1.0.*")]
diff --git a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
index 428d5f5..e50360a 100644
--- a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
+++ b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
@@ -89,8 +89,8 @@ namespace RemoteGridServers
89 String grTest = sr.ReadLine(); 89 String grTest = sr.ReadLine();
90 sr.Close(); 90 sr.Close();
91 GridResponse.Close(); 91 GridResponse.Close();
92 if(String.IsNullOrEmpty(grTest) || grTest.Equals("1")) 92 //if(String.IsNullOrEmpty(grTest) || grTest.Equals("1"))
93 { 93 //{
94 // YAY! Valid login 94 // YAY! Valid login
95 user.Authorised = true; 95 user.Authorised = true;
96 user.LoginInfo = new Login(); 96 user.LoginInfo = new Login();
@@ -99,12 +99,12 @@ namespace RemoteGridServers
99 user.LoginInfo.First = ""; 99 user.LoginInfo.First = "";
100 user.LoginInfo.Last = ""; 100 user.LoginInfo.Last = "";
101 101
102 } 102 //}
103 else 103 //else
104 { 104 //{
105 // Invalid 105 // // Invalid
106 user.Authorised = false; 106 // user.Authorised = false;
107 } 107 //}
108 108
109 return(user); 109 return(user);
110 } 110 }
diff --git a/src/ServerConsole/ServerConsole/AssemblyInfo.cs b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
index 00a9b7d..88b4019 100644
--- a/src/ServerConsole/ServerConsole/AssemblyInfo.cs
+++ b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
@@ -1,31 +1,21 @@
1using System.Reflection; 1using System;
2using System.Runtime.CompilerServices; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// Information about this assembly is defined by the following 5// ------------------------------------------------------------------------------
6// attributes. 6// <autogenerated>
7// 7// This code was generated by a tool.
8// change them to the information which is associated with the assembly 8// Mono Runtime Version: 2.0.50727.42
9// you compile. 9//
10 10// Changes to this file may cause incorrect behavior and will be lost if
11[assembly: AssemblyTitle("ServerConsole")] 11// the code is regenerated.
12[assembly: AssemblyDescription("")] 12// </autogenerated>
13[assembly: AssemblyConfiguration("")] 13// ------------------------------------------------------------------------------
14[assembly: AssemblyCompany("")] 14
15[assembly: AssemblyProduct("ServerConsole")] 15[assembly: ComVisibleAttribute(false)]
16[assembly: AssemblyCopyright("")] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyTrademark("")] 17[assembly: AssemblyVersionAttribute("0.1.*.191")]
18[assembly: AssemblyCulture("")] 18[assembly: AssemblyTitleAttribute("opensim-serverconsole")]
19 19[assembly: AssemblyDescriptionAttribute("The default server console")]
20// This sets the default COM visibility of types in the assembly to invisible. 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21// If you need to expose a type to COM, use [ComVisible(true)] on that type. 21
22[assembly: ComVisible(false)]
23
24// The assembly version has following format :
25//
26// Major.Minor.Build.Revision
27//
28// You can specify all values by your own or you can build default build and revision
29// numbers with the '*' character (the default):
30
31[assembly: AssemblyVersion("1.0.*")]
diff --git a/src/ServerConsole/ServerConsole/ServerConsole.cs b/src/ServerConsole/ServerConsole/ServerConsole.cs
index 27d97e5..93c8114 100644
--- a/src/ServerConsole/ServerConsole/ServerConsole.cs
+++ b/src/ServerConsole/ServerConsole/ServerConsole.cs
@@ -43,7 +43,12 @@ namespace ServerConsole
43 instance = value; 43 instance = value;
44 } 44 }
45 } 45 }
46 } 46
47 public MainConsole()
48 {
49
50 }
51 }
47 52
48 public abstract class ConsoleBase 53 public abstract class ConsoleBase
49 { 54 {
@@ -55,15 +60,16 @@ namespace ServerConsole
55 } 60 }
56 61
57 public abstract void Close(); 62 public abstract void Close();
58 63
59 public abstract void Write(string format, params object[] args); 64 // You know what ReadLine() and WriteLine() do, right? And Read() and Write()? Right, you do actually know C#, right? Are you actually a programmer? Do you know english? Do you find my sense of humour in comments irritating? Good, glad you're still here
60 65 public abstract void WriteLine(string Line) ;
61 public abstract void WriteLine(string format, params object[] args); 66
62
63 public abstract string ReadLine(); 67 public abstract string ReadLine();
64 68
65 public abstract int Read() ; 69 public abstract int Read() ;
66 70
71 public abstract void Write(string Line) ;
72
67 // Displays a command prompt and waits for the user to enter a string, then returns that string 73 // Displays a command prompt and waits for the user to enter a string, then returns that string
68 public abstract string CmdPrompt(string prompt) ; 74 public abstract string CmdPrompt(string prompt) ;
69 75
@@ -81,7 +87,5 @@ namespace ServerConsole
81 87
82 // Displays a prompt to the user and then runs the command they entered 88 // Displays a prompt to the user and then runs the command they entered
83 public abstract void MainConsolePrompt() ; 89 public abstract void MainConsolePrompt() ;
84 90 }
85 public abstract void SetStatus( string status );
86 }
87} 91}
diff --git a/src/VersionInfo.cs b/src/VersionInfo.cs
index 949462c..b3cc6a5 100644
--- a/src/VersionInfo.cs
+++ b/src/VersionInfo.cs
@@ -32,6 +32,6 @@ namespace OpenSim
32 /// </summary> 32 /// </summary>
33 public class VersionInfo 33 public class VersionInfo
34 { 34 {
35 public static string Version = "0.1, Build 1173288035, Revision 148M"; 35 public static string Version = "0.1, Build 1173778834, Revision 191M";
36 } 36 }
37} 37}
diff --git a/src/physics/AssemblyInfo.cs b/src/physics/AssemblyInfo.cs
index 57a8913..1cc3ee1 100644
--- a/src/physics/AssemblyInfo.cs
+++ b/src/physics/AssemblyInfo.cs
@@ -1,31 +1,21 @@
1using System.Reflection; 1using System;
2using System.Runtime.CompilerServices; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// Information about this assembly is defined by the following 5// ------------------------------------------------------------------------------
6// attributes. 6// <autogenerated>
7// 7// This code was generated by a tool.
8// change them to the information which is associated with the assembly 8// Mono Runtime Version: 2.0.50727.42
9// you compile. 9//
10 10// Changes to this file may cause incorrect behavior and will be lost if
11[assembly: AssemblyTitle("PhysicsManager")] 11// the code is regenerated.
12[assembly: AssemblyDescription("")] 12// </autogenerated>
13[assembly: AssemblyConfiguration("")] 13// ------------------------------------------------------------------------------
14[assembly: AssemblyCompany("")] 14
15[assembly: AssemblyProduct("PhysicsManager")] 15[assembly: ComVisibleAttribute(false)]
16[assembly: AssemblyCopyright("")] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyTrademark("")] 17[assembly: AssemblyVersionAttribute("0.1.*.191")]
18[assembly: AssemblyCulture("")] 18[assembly: AssemblyTitleAttribute("opensim-physicsmanager")]
19 19[assembly: AssemblyDescriptionAttribute("Handles physics plugins")]
20// This sets the default COM visibility of types in the assembly to invisible. 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21// If you need to expose a type to COM, use [ComVisible(true)] on that type. 21
22[assembly: ComVisible(false)]
23
24// The assembly version has following format :
25//
26// Major.Minor.Build.Revision
27//
28// You can specify all values by your own or you can build default build and revision
29// numbers with the '*' character (the default):
30
31[assembly: AssemblyVersion("1.0.*")]
diff --git a/src/physics/PhysicsManager.cs b/src/physics/PhysicsManager.cs
index 1fee628..e5d5bd6 100644
--- a/src/physics/PhysicsManager.cs
+++ b/src/physics/PhysicsManager.cs
@@ -46,21 +46,15 @@ namespace PhysicsSystem
46 46
47 public PhysicsScene GetPhysicsScene(string engineName) 47 public PhysicsScene GetPhysicsScene(string engineName)
48 { 48 {
49 if( String.IsNullOrEmpty( engineName ) ) 49 if(_plugins.ContainsKey(engineName))
50 {
51 return new NullPhysicsScene();
52 }
53
54 if(_plugins.ContainsKey(engineName))
55 { 50 {
56 ServerConsole.MainConsole.Instance.WriteLine("creating "+engineName); 51 ServerConsole.MainConsole.Instance.WriteLine("creating "+engineName);
57 return _plugins[engineName].GetScene(); 52 return _plugins[engineName].GetScene();
58 } 53 }
59 else 54 else
60 { 55 {
61 string error = String.Format("couldn't find physicsEngine: {0}", engineName); 56 ServerConsole.MainConsole.Instance.WriteLine("couldn't find physicsEngine: "+ engineName);
62 ServerConsole.MainConsole.Instance.WriteLine( error ); 57 return null;
63 throw new ArgumentException( error );
64 } 58 }
65 } 59 }
66 60
@@ -114,14 +108,6 @@ namespace PhysicsSystem
114 108
115 public abstract class PhysicsScene 109 public abstract class PhysicsScene
116 { 110 {
117 public static PhysicsScene Null
118 {
119 get
120 {
121 return new NullPhysicsScene();
122 }
123 }
124
125 public abstract PhysicsActor AddAvatar(PhysicsVector position); 111 public abstract PhysicsActor AddAvatar(PhysicsVector position);
126 112
127 public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size); 113 public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size);
@@ -138,49 +124,8 @@ namespace PhysicsSystem
138 } 124 }
139 } 125 }
140 126
141 public class NullPhysicsScene : PhysicsScene
142 {
143 private static int m_workIndicator;
144
145 public override PhysicsActor AddAvatar(PhysicsVector position)
146 {
147 ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : AddAvatar({0})", position );
148 return PhysicsActor.Null;
149 }
150
151 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
152 {
153 ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : AddPrim({0},{1})", position, size );
154 return PhysicsActor.Null;
155 }
156
157 public override void Simulate(float timeStep)
158 {
159 m_workIndicator = ( m_workIndicator + 1 ) % 10;
160
161 ServerConsole.MainConsole.Instance.SetStatus( m_workIndicator.ToString() );
162 }
163
164 public override void GetResults()
165 {
166 ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : GetResults()" );
167 }
168
169 public override void SetTerrain(float[] heightMap)
170 {
171 ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length );
172 }
173
174 public override bool IsThreaded
175 {
176 get { return false; }
177 }
178 }
179
180 public abstract class PhysicsActor 127 public abstract class PhysicsActor
181 { 128 {
182 public static readonly PhysicsActor Null = new NullPhysicsActor();
183
184 public abstract PhysicsVector Position 129 public abstract PhysicsVector Position
185 { 130 {
186 get; 131 get;
@@ -208,61 +153,7 @@ namespace PhysicsSystem
208 public abstract void SetMomentum(PhysicsVector momentum); 153 public abstract void SetMomentum(PhysicsVector momentum);
209 } 154 }
210 155
211 public class NullPhysicsActor : PhysicsActor 156 public class PhysicsVector
212 {
213 public override PhysicsVector Position
214 {
215 get
216 {
217 return PhysicsVector.Zero;
218 }
219 set
220 {
221 return;
222 }
223 }
224
225 public override PhysicsVector Velocity
226 {
227 get
228 {
229 return PhysicsVector.Zero;
230 }
231 set
232 {
233 return;
234 }
235 }
236
237 public override PhysicsVector Acceleration
238 {
239 get { return PhysicsVector.Zero; }
240 }
241
242 public override bool Flying
243 {
244 get
245 {
246 return false;
247 }
248 set
249 {
250 return;
251 }
252 }
253
254 public override void AddForce(PhysicsVector force)
255 {
256 return;
257 }
258
259 public override void SetMomentum(PhysicsVector momentum)
260 {
261 return;
262 }
263 }
264
265 public class PhysicsVector
266 { 157 {
267 public float X; 158 public float X;
268 public float Y; 159 public float Y;
@@ -279,7 +170,5 @@ namespace PhysicsSystem
279 Y = y; 170 Y = y;
280 Z = z; 171 Z = z;
281 } 172 }
282
283 public static readonly PhysicsVector Zero = new PhysicsVector(0f, 0f, 0f);
284 } 173 }
285} 174}
diff --git a/src/physics/plugins/AssemblyInfo.cs b/src/physics/plugins/AssemblyInfo.cs
index 0c9c06c..2c12da4 100644
--- a/src/physics/plugins/AssemblyInfo.cs
+++ b/src/physics/plugins/AssemblyInfo.cs
@@ -1,31 +1,21 @@
1using System.Reflection; 1using System;
2using System.Runtime.CompilerServices; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// Information about this assembly is defined by the following 5// ------------------------------------------------------------------------------
6// attributes. 6// <autogenerated>
7// 7// This code was generated by a tool.
8// change them to the information which is associated with the assembly 8// Mono Runtime Version: 2.0.50727.42
9// you compile. 9//
10 10// Changes to this file may cause incorrect behavior and will be lost if
11[assembly: AssemblyTitle("PhysXplugin")] 11// the code is regenerated.
12[assembly: AssemblyDescription("")] 12// </autogenerated>
13[assembly: AssemblyConfiguration("")] 13// ------------------------------------------------------------------------------
14[assembly: AssemblyCompany("")] 14
15[assembly: AssemblyProduct("PhysXplugin")] 15[assembly: ComVisibleAttribute(false)]
16[assembly: AssemblyCopyright("")] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyTrademark("")] 17[assembly: AssemblyVersionAttribute("0.1.*.191")]
18[assembly: AssemblyCulture("")] 18[assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")]
19 19[assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")]
20// This sets the default COM visibility of types in the assembly to invisible. 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21// If you need to expose a type to COM, use [ComVisible(true)] on that type. 21
22[assembly: ComVisible(false)]
23
24// The assembly version has following format :
25//
26// Major.Minor.Build.Revision
27//
28// You can specify all values by your own or you can build default build and revision
29// numbers with the '*' character (the default):
30
31[assembly: AssemblyVersion("1.0.*")]