aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Config.cs7
-rw-r--r--src/Config/SimConfig/AssemblyInfo.cs42
-rw-r--r--src/Config/SimConfig/Db4SimConfig.cs6
-rw-r--r--src/GridInterfaces/AssemblyInfo.cs42
-rw-r--r--src/GridInterfaces/IGridServer.cs12
-rw-r--r--src/LocalServers/LocalGridServers/AssemblyInfo.cs42
-rw-r--r--src/LocalServers/LocalGridServers/LocalGrid.cs10
-rw-r--r--src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs42
-rw-r--r--src/Main.cs2
-rw-r--r--src/OpenSim.Framework/AssemblyInfo.cs42
-rw-r--r--src/RemoteServers/RemoteGridServers/AssemblyInfo.cs42
-rw-r--r--src/RemoteServers/RemoteGridServers/RemoteGrid.cs20
-rw-r--r--src/ServerConsole/ServerConsole/AssemblyInfo.cs42
-rw-r--r--src/VersionInfo.cs2
-rw-r--r--src/physics/AssemblyInfo.cs42
-rw-r--r--src/physics/plugins/AssemblyInfo.cs42
16 files changed, 228 insertions, 209 deletions
diff --git a/src/Config.cs b/src/Config.cs
index c7cd3cd..1c0a6cc 100644
--- a/src/Config.cs
+++ b/src/Config.cs
@@ -59,7 +59,12 @@ namespace OpenSim
59 59
60 public string GridURL; 60 public string GridURL;
61 public string GridSendKey; 61 public string GridSendKey;
62 62 public string GridRecvKey;
63 public string UserURL;
64 public string UserSendKey;
65 public string UserRecvKey;
66
67
63 public abstract void InitConfig(); 68 public abstract void InitConfig();
64 public abstract void LoadFromGrid(); 69 public abstract void LoadFromGrid();
65 public abstract World LoadWorld(); 70 public abstract World LoadWorld();
diff --git a/src/Config/SimConfig/AssemblyInfo.cs b/src/Config/SimConfig/AssemblyInfo.cs
index f808f4c..c97d673 100644
--- a/src/Config/SimConfig/AssemblyInfo.cs
+++ b/src/Config/SimConfig/AssemblyInfo.cs
@@ -1,21 +1,21 @@
1using System; 1using System;
2using System.Reflection; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5//------------------------------------------------------------------------------ 5// ------------------------------------------------------------------------------
6// <auto-generated> 6// <autogenerated>
7// This code was generated by a tool. 7// This code was generated by a tool.
8// Runtime Version:2.0.50727.42 8// Mono Runtime Version: 2.0.50727.42
9// 9//
10// Changes to this file may cause incorrect behavior and will be lost if 10// Changes to this file may cause incorrect behavior and will be lost if
11// the code is regenerated. 11// the code is regenerated.
12// </auto-generated> 12// </autogenerated>
13//------------------------------------------------------------------------------ 13// ------------------------------------------------------------------------------
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.0.0.1")] 17[assembly: AssemblyVersionAttribute("0.1.*.236")]
18[assembly: AssemblyTitleAttribute("opensim-simconfig")] 18[assembly: AssemblyTitleAttribute("opensim-simconfig")]
19[assembly: AssemblyDescriptionAttribute("The default configuration handler")] 19[assembly: AssemblyDescriptionAttribute("The default configuration handler")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21 21
diff --git a/src/Config/SimConfig/Db4SimConfig.cs b/src/Config/SimConfig/Db4SimConfig.cs
index fc2c019..1b696fe 100644
--- a/src/Config/SimConfig/Db4SimConfig.cs
+++ b/src/Config/SimConfig/Db4SimConfig.cs
@@ -59,7 +59,11 @@ namespace Db40SimConfig
59 this.AssetURL=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server URL: "); 59 this.AssetURL=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server URL: ");
60 this.AssetSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server key: "); 60 this.AssetSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Asset server key: ");
61 this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid server URL: "); 61 this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid server URL: ");
62 this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Grid server key: "); 62 this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid server: ");
63 this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid server: ");
64 this.UserURL=ServerConsole.MainConsole.Instance.CmdPrompt("User server URL: ");
65 this.UserSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to user server: ");
66 this.UserRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from user server: ");
63 } 67 }
64 this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256)); 68 this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256));
65 } 69 }
diff --git a/src/GridInterfaces/AssemblyInfo.cs b/src/GridInterfaces/AssemblyInfo.cs
index 0ff408f..186934a 100644
--- a/src/GridInterfaces/AssemblyInfo.cs
+++ b/src/GridInterfaces/AssemblyInfo.cs
@@ -1,21 +1,21 @@
1using System; 1using System;
2using System.Reflection; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5//------------------------------------------------------------------------------ 5// ------------------------------------------------------------------------------
6// <auto-generated> 6// <autogenerated>
7// This code was generated by a tool. 7// This code was generated by a tool.
8// Runtime Version:2.0.50727.42 8// Mono Runtime Version: 2.0.50727.42
9// 9//
10// Changes to this file may cause incorrect behavior and will be lost if 10// Changes to this file may cause incorrect behavior and will be lost if
11// the code is regenerated. 11// the code is regenerated.
12// </auto-generated> 12// </autogenerated>
13//------------------------------------------------------------------------------ 13// ------------------------------------------------------------------------------
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.0.0.1")] 17[assembly: AssemblyVersionAttribute("0.1.*.236")]
18[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")] 18[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
19[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")] 19[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21 21
diff --git a/src/GridInterfaces/IGridServer.cs b/src/GridInterfaces/IGridServer.cs
index 51f5054..8ab0971 100644
--- a/src/GridInterfaces/IGridServer.cs
+++ b/src/GridInterfaces/IGridServer.cs
@@ -47,12 +47,12 @@ namespace OpenSim.GridServers
47 public interface IGridServer 47 public interface IGridServer
48 { 48 {
49 UUIDBlock RequestUUIDBlock(); 49 UUIDBlock RequestUUIDBlock();
50 void RequestNeighbours(); //should return a array of neighbouring regions 50 neighbourinfo[] RequestNeighbours(); //should return a array of neighbouring regions
51 AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 51 AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
52 bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 52 bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
53 string GetName(); 53 string GetName();
54 bool RequestConnection(); 54 bool RequestConnection();
55 void SetServerInfo(string ServerUrl, string ServerKey); 55 void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey);
56 } 56 }
57 57
58 public abstract class RemoteGridBase : IGridServer 58 public abstract class RemoteGridBase : IGridServer
@@ -63,23 +63,23 @@ namespace OpenSim.GridServers
63 } 63 }
64 64
65 public abstract UUIDBlock RequestUUIDBlock(); 65 public abstract UUIDBlock RequestUUIDBlock();
66 public abstract void RequestNeighbours(); 66 public abstract neighbourinfo[] RequestNeighbours();
67 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 67 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
68 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 68 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
69 public abstract string GetName(); 69 public abstract string GetName();
70 public abstract bool RequestConnection(); 70 public abstract bool RequestConnection();
71 public abstract void SetServerInfo(string ServerUrl, string ServerKey); 71 public abstract void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey);
72 } 72 }
73 73
74 public abstract class LocalGridBase : IGridServer 74 public abstract class LocalGridBase : IGridServer
75 { 75 {
76 public abstract UUIDBlock RequestUUIDBlock(); 76 public abstract UUIDBlock RequestUUIDBlock();
77 public abstract void RequestNeighbours(); 77 public abstract neighbourinfo[] RequestNeighbours();
78 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 78 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
79 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 79 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
80 public abstract string GetName(); 80 public abstract string GetName();
81 public abstract bool RequestConnection(); 81 public abstract bool RequestConnection();
82 public abstract void SetServerInfo(string ServerUrl, string ServerKey); 82 public abstract void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey);
83 public abstract void AddNewSession(Login session); 83 public abstract void AddNewSession(Login session);
84 } 84 }
85 85
diff --git a/src/LocalServers/LocalGridServers/AssemblyInfo.cs b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
index 3ca41e4..6dbf063 100644
--- a/src/LocalServers/LocalGridServers/AssemblyInfo.cs
+++ b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
@@ -1,21 +1,21 @@
1using System; 1using System;
2using System.Reflection; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5//------------------------------------------------------------------------------ 5// ------------------------------------------------------------------------------
6// <auto-generated> 6// <autogenerated>
7// This code was generated by a tool. 7// This code was generated by a tool.
8// Runtime Version:2.0.50727.42 8// Mono Runtime Version: 2.0.50727.42
9// 9//
10// Changes to this file may cause incorrect behavior and will be lost if 10// Changes to this file may cause incorrect behavior and will be lost if
11// the code is regenerated. 11// the code is regenerated.
12// </auto-generated> 12// </autogenerated>
13//------------------------------------------------------------------------------ 13// ------------------------------------------------------------------------------
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.0.0.1")] 17[assembly: AssemblyVersionAttribute("0.1.*.236")]
18[assembly: AssemblyTitleAttribute("opensim-localservers")] 18[assembly: AssemblyTitleAttribute("opensim-localservers")]
19[assembly: AssemblyDescriptionAttribute("local grid servers")] 19[assembly: AssemblyDescriptionAttribute("local grid servers")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21 21
diff --git a/src/LocalServers/LocalGridServers/LocalGrid.cs b/src/LocalServers/LocalGridServers/LocalGrid.cs
index 32ed113..abea888 100644
--- a/src/LocalServers/LocalGridServers/LocalGrid.cs
+++ b/src/LocalServers/LocalGridServers/LocalGrid.cs
@@ -96,7 +96,7 @@ namespace LocalGridServers
96 96
97 } 97 }
98 98
99 public void SetServerInfo(string ServerUrl, string ServerKey) 99 public void SetServerInfo(string ServerUrl, string SendKey)
100 { 100 {
101 101
102 } 102 }
@@ -105,7 +105,7 @@ namespace LocalGridServers
105 { 105 {
106 while(true) 106 while(true)
107 { 107 {
108 108 Thread.Sleep(1000);
109 } 109 }
110 } 110 }
111 } 111 }
@@ -160,12 +160,12 @@ namespace LocalGridServers
160 return(uuidBlock); 160 return(uuidBlock);
161 } 161 }
162 162
163 public override void RequestNeighbours() 163 public override neighbourinfo[] RequestNeighbours()
164 { 164 {
165 return; 165 return new neighbourinfo[8];
166 } 166 }
167 167
168 public override void SetServerInfo(string ServerUrl, string ServerKey) 168 public override void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey)
169 { 169 {
170 170
171 } 171 }
diff --git a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
index 79ad036..b6afd99 100644
--- a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
+++ b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
@@ -1,21 +1,21 @@
1using System; 1using System;
2using System.Reflection; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5//------------------------------------------------------------------------------ 5// ------------------------------------------------------------------------------
6// <auto-generated> 6// <autogenerated>
7// This code was generated by a tool. 7// This code was generated by a tool.
8// Runtime Version:2.0.50727.42 8// Mono Runtime Version: 2.0.50727.42
9// 9//
10// Changes to this file may cause incorrect behavior and will be lost if 10// Changes to this file may cause incorrect behavior and will be lost if
11// the code is regenerated. 11// the code is regenerated.
12// </auto-generated> 12// </autogenerated>
13//------------------------------------------------------------------------------ 13// ------------------------------------------------------------------------------
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.0.0.1")] 17[assembly: AssemblyVersionAttribute("0.1.*.236")]
18[assembly: AssemblyTitleAttribute("opensim-localstorage")] 18[assembly: AssemblyTitleAttribute("opensim-localstorage")]
19[assembly: AssemblyDescriptionAttribute("The local storage handler")] 19[assembly: AssemblyDescriptionAttribute("The local storage handler")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21 21
diff --git a/src/Main.cs b/src/Main.cs
index 8446c5e..a738d03 100644
--- a/src/Main.cs
+++ b/src/Main.cs
@@ -161,7 +161,7 @@ namespace OpenSim
161 local_world.PhysScene.SetTerrain(local_world.LandMap); 161 local_world.PhysScene.SetTerrain(local_world.LandMap);
162 162
163 OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey); 163 OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey);
164 OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey); 164 OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey, OpenSim_Main.cfg.GridRecvKey, OpenSim_Main.cfg.UserURL, OpenSim_Main.cfg.UserSendKey, OpenSim_Main.cfg.UserRecvKey);
165 165
166 local_world.LoadStorageDLL("Db4LocalStorage.dll"); //all these dll names shouldn't be hard coded. 166 local_world.LoadStorageDLL("Db4LocalStorage.dll"); //all these dll names shouldn't be hard coded.
167 local_world.LoadPrimsFromStorage(); 167 local_world.LoadPrimsFromStorage();
diff --git a/src/OpenSim.Framework/AssemblyInfo.cs b/src/OpenSim.Framework/AssemblyInfo.cs
index 0ff408f..186934a 100644
--- a/src/OpenSim.Framework/AssemblyInfo.cs
+++ b/src/OpenSim.Framework/AssemblyInfo.cs
@@ -1,21 +1,21 @@
1using System; 1using System;
2using System.Reflection; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5//------------------------------------------------------------------------------ 5// ------------------------------------------------------------------------------
6// <auto-generated> 6// <autogenerated>
7// This code was generated by a tool. 7// This code was generated by a tool.
8// Runtime Version:2.0.50727.42 8// Mono Runtime Version: 2.0.50727.42
9// 9//
10// Changes to this file may cause incorrect behavior and will be lost if 10// Changes to this file may cause incorrect behavior and will be lost if
11// the code is regenerated. 11// the code is regenerated.
12// </auto-generated> 12// </autogenerated>
13//------------------------------------------------------------------------------ 13// ------------------------------------------------------------------------------
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.0.0.1")] 17[assembly: AssemblyVersionAttribute("0.1.*.236")]
18[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")] 18[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
19[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")] 19[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21 21
diff --git a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
index 4e8fb00..b662c4e 100644
--- a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
+++ b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
@@ -1,21 +1,21 @@
1using System; 1using System;
2using System.Reflection; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5//------------------------------------------------------------------------------ 5// ------------------------------------------------------------------------------
6// <auto-generated> 6// <autogenerated>
7// This code was generated by a tool. 7// This code was generated by a tool.
8// Runtime Version:2.0.50727.42 8// Mono Runtime Version: 2.0.50727.42
9// 9//
10// Changes to this file may cause incorrect behavior and will be lost if 10// Changes to this file may cause incorrect behavior and will be lost if
11// the code is regenerated. 11// the code is regenerated.
12// </auto-generated> 12// </autogenerated>
13//------------------------------------------------------------------------------ 13// ------------------------------------------------------------------------------
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.0.0.1")] 17[assembly: AssemblyVersionAttribute("0.1.*.236")]
18[assembly: AssemblyTitleAttribute("opensim-remoteservers")] 18[assembly: AssemblyTitleAttribute("opensim-remoteservers")]
19[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")] 19[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21 21
diff --git a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
index 17b6440..4f5d3a9 100644
--- a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
+++ b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
@@ -69,6 +69,11 @@ namespace RemoteGridServers
69 { 69 {
70 private string GridServerUrl; 70 private string GridServerUrl;
71 private string GridSendKey; 71 private string GridSendKey;
72 private string GridRecvKey;
73 private string UserServerUrl;
74 private string UserSendKey;
75 private string UserRecvKey;
76
72 private Dictionary<uint, agentcircuitdata> AgentCircuits = new Dictionary<uint, agentcircuitdata>(); 77 private Dictionary<uint, agentcircuitdata> AgentCircuits = new Dictionary<uint, agentcircuitdata>();
73 78
74 public override Dictionary<uint, agentcircuitdata> agentcircuits { 79 public override Dictionary<uint, agentcircuitdata> agentcircuits {
@@ -132,15 +137,20 @@ namespace RemoteGridServers
132 return(uuidBlock); 137 return(uuidBlock);
133 } 138 }
134 139
135 public override void RequestNeighbours() 140 public override neighbourinfo[] RequestNeighbours()
136 { 141 {
137 return; 142 neighbourinfo[] neighbours= new neighbourinfo[8];
143 return neighbours;
138 } 144 }
139 145
140 public override void SetServerInfo(string ServerUrl, string ServerKey) 146 public override void SetServerInfo(string UserServerUrl, string UserSendKey, string UserRecvKey, string GridServerKey, string GridSendKey, string GridRecvKey)
141 { 147 {
142 this.GridServerUrl = ServerUrl; 148 this.UserServerUrl = UserServerUrl;
143 this.GridSendKey = ServerKey; 149 this.UserSendKey = UserSendKey;
150 this.UserRecvKey = UserRecvKey;
151 this.GridServerUrl = GridServerUrl;
152 this.GridSendKey = GridSendKey;
153 this.GridRecvKey = GridRecvKey;
144 } 154 }
145 155
146 public override string GetName() 156 public override string GetName()
diff --git a/src/ServerConsole/ServerConsole/AssemblyInfo.cs b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
index 99da873..f1c084b 100644
--- a/src/ServerConsole/ServerConsole/AssemblyInfo.cs
+++ b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
@@ -1,21 +1,21 @@
1using System; 1using System;
2using System.Reflection; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5//------------------------------------------------------------------------------ 5// ------------------------------------------------------------------------------
6// <auto-generated> 6// <autogenerated>
7// This code was generated by a tool. 7// This code was generated by a tool.
8// Runtime Version:2.0.50727.42 8// Mono Runtime Version: 2.0.50727.42
9// 9//
10// Changes to this file may cause incorrect behavior and will be lost if 10// Changes to this file may cause incorrect behavior and will be lost if
11// the code is regenerated. 11// the code is regenerated.
12// </auto-generated> 12// </autogenerated>
13//------------------------------------------------------------------------------ 13// ------------------------------------------------------------------------------
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.0.0.1")] 17[assembly: AssemblyVersionAttribute("0.1.*.236")]
18[assembly: AssemblyTitleAttribute("opensim-serverconsole")] 18[assembly: AssemblyTitleAttribute("opensim-serverconsole")]
19[assembly: AssemblyDescriptionAttribute("The default server console")] 19[assembly: AssemblyDescriptionAttribute("The default server console")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21 21
diff --git a/src/VersionInfo.cs b/src/VersionInfo.cs
index 5994b49..5fc0fb0 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 1173843165, Revision 193:206M"; 35 public static string Version = "0.1, Build 1174249095, Revision 236M";
36 } 36 }
37} 37}
diff --git a/src/physics/AssemblyInfo.cs b/src/physics/AssemblyInfo.cs
index b16bac9..7489b7a 100644
--- a/src/physics/AssemblyInfo.cs
+++ b/src/physics/AssemblyInfo.cs
@@ -1,21 +1,21 @@
1using System; 1using System;
2using System.Reflection; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5//------------------------------------------------------------------------------ 5// ------------------------------------------------------------------------------
6// <auto-generated> 6// <autogenerated>
7// This code was generated by a tool. 7// This code was generated by a tool.
8// Runtime Version:2.0.50727.42 8// Mono Runtime Version: 2.0.50727.42
9// 9//
10// Changes to this file may cause incorrect behavior and will be lost if 10// Changes to this file may cause incorrect behavior and will be lost if
11// the code is regenerated. 11// the code is regenerated.
12// </auto-generated> 12// </autogenerated>
13//------------------------------------------------------------------------------ 13// ------------------------------------------------------------------------------
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.0.0.1")] 17[assembly: AssemblyVersionAttribute("0.1.*.236")]
18[assembly: AssemblyTitleAttribute("opensim-physicsmanager")] 18[assembly: AssemblyTitleAttribute("opensim-physicsmanager")]
19[assembly: AssemblyDescriptionAttribute("Handles physics plugins")] 19[assembly: AssemblyDescriptionAttribute("Handles physics plugins")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21 21
diff --git a/src/physics/plugins/AssemblyInfo.cs b/src/physics/plugins/AssemblyInfo.cs
index 125d417..d37a5da 100644
--- a/src/physics/plugins/AssemblyInfo.cs
+++ b/src/physics/plugins/AssemblyInfo.cs
@@ -1,21 +1,21 @@
1using System; 1using System;
2using System.Reflection; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5//------------------------------------------------------------------------------ 5// ------------------------------------------------------------------------------
6// <auto-generated> 6// <autogenerated>
7// This code was generated by a tool. 7// This code was generated by a tool.
8// Runtime Version:2.0.50727.42 8// Mono Runtime Version: 2.0.50727.42
9// 9//
10// Changes to this file may cause incorrect behavior and will be lost if 10// Changes to this file may cause incorrect behavior and will be lost if
11// the code is regenerated. 11// the code is regenerated.
12// </auto-generated> 12// </autogenerated>
13//------------------------------------------------------------------------------ 13// ------------------------------------------------------------------------------
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.0.0.1")] 17[assembly: AssemblyVersionAttribute("0.1.*.236")]
18[assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")] 18[assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")]
19[assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")] 19[assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21 21
generated by cgit v1.1 at 2024-11-12 13:05:42 +0000