diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/PacketServer.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/UDPServer.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs | 4 |
6 files changed, 3 insertions, 17 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 1471f89..542c5cd 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -164,20 +164,13 @@ namespace OpenSim | |||
164 | config.Set("physics", "basicphysics"); | 164 | config.Set("physics", "basicphysics"); |
165 | config.Set("verbose", true); | 165 | config.Set("verbose", true); |
166 | config.Set("physical_prim", true); | 166 | config.Set("physical_prim", true); |
167 | |||
168 | config.Set("child_get_tasks", false); | 167 | config.Set("child_get_tasks", false); |
169 | |||
170 | config.Set("serverside_object_permissions", false); | 168 | config.Set("serverside_object_permissions", false); |
171 | |||
172 | config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); | 169 | config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); |
173 | |||
174 | config.Set("startup_console_commands_file", ""); | 170 | config.Set("startup_console_commands_file", ""); |
175 | config.Set("shutdown_console_commands_file", ""); | 171 | config.Set("shutdown_console_commands_file", ""); |
176 | |||
177 | config.Set("script_engine", "DotNetEngine"); | 172 | config.Set("script_engine", "DotNetEngine"); |
178 | |||
179 | config.Set("asset_database", "sqlite"); | 173 | config.Set("asset_database", "sqlite"); |
180 | |||
181 | } | 174 | } |
182 | 175 | ||
183 | if (m_config.Configs["StandAlone"] == null) | 176 | if (m_config.Configs["StandAlone"] == null) |
@@ -201,7 +194,6 @@ namespace OpenSim | |||
201 | { | 194 | { |
202 | config.Set("default_location_x", 1000); | 195 | config.Set("default_location_x", 1000); |
203 | config.Set("default_location_y", 1000); | 196 | config.Set("default_location_y", 1000); |
204 | |||
205 | config.Set("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort); | 197 | config.Set("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort); |
206 | config.Set("remoting_listener_port", NetworkServersInfo.RemotingListenerPort); | 198 | config.Set("remoting_listener_port", NetworkServersInfo.RemotingListenerPort); |
207 | config.Set("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()); | 199 | config.Set("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()); |
@@ -214,7 +206,6 @@ namespace OpenSim | |||
214 | config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString()); | 206 | config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString()); |
215 | } | 207 | } |
216 | 208 | ||
217 | |||
218 | if (m_config.Configs["RemoteAdmin"] == null) | 209 | if (m_config.Configs["RemoteAdmin"] == null) |
219 | m_config.AddConfig("RemoteAdmin"); | 210 | m_config.AddConfig("RemoteAdmin"); |
220 | config = m_config.Configs["RemoteAdmin"]; | 211 | config = m_config.Configs["RemoteAdmin"]; |
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 653077f..0514df5 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -202,7 +202,6 @@ namespace OpenSim.Region.ClientStack | |||
202 | 202 | ||
203 | # region Client Methods | 203 | # region Client Methods |
204 | 204 | ||
205 | |||
206 | public void Close() | 205 | public void Close() |
207 | { | 206 | { |
208 | // Pull Client out of Region | 207 | // Pull Client out of Region |
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs index e56a0b8..945bb82 100644 --- a/OpenSim/Region/ClientStack/PacketServer.cs +++ b/OpenSim/Region/ClientStack/PacketServer.cs | |||
@@ -104,7 +104,6 @@ namespace OpenSim.Region.ClientStack | |||
104 | CloseClient(client); | 104 | CloseClient(client); |
105 | } | 105 | } |
106 | 106 | ||
107 | |||
108 | /// <summary> | 107 | /// <summary> |
109 | /// | 108 | /// |
110 | /// </summary> | 109 | /// </summary> |
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 82a5c3c..fd7e04f 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -128,8 +128,8 @@ namespace OpenSim.Region.ClientStack | |||
128 | { | 128 | { |
129 | masterAvatar = | 129 | masterAvatar = |
130 | m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, | 130 | m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, |
131 | scene.RegionInfo.MasterAvatarLastName, | 131 | scene.RegionInfo.MasterAvatarLastName, |
132 | scene.RegionInfo.MasterAvatarSandboxPassword); | 132 | scene.RegionInfo.MasterAvatarSandboxPassword); |
133 | } | 133 | } |
134 | 134 | ||
135 | if (masterAvatar != null) | 135 | if (masterAvatar != null) |
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index 21e4359..8095646 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs | |||
@@ -71,6 +71,7 @@ namespace OpenSim.Region.ClientStack | |||
71 | } | 71 | } |
72 | 72 | ||
73 | } | 73 | } |
74 | |||
74 | public ulong RegionHandle | 75 | public ulong RegionHandle |
75 | { | 76 | { |
76 | get | 77 | get |
diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs index 86ddfaf..0b95aee 100644 --- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs +++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs | |||
@@ -67,7 +67,6 @@ namespace OpenSim.Region.Environment.Modules | |||
67 | } | 67 | } |
68 | } | 68 | } |
69 | 69 | ||
70 | |||
71 | public void Initialise(Scene scene, IConfigSource source) | 70 | public void Initialise(Scene scene, IConfigSource source) |
72 | { | 71 | { |
73 | scene.RegisterModuleInterface<IAvatarFactory>(this); | 72 | scene.RegisterModuleInterface<IAvatarFactory>(this); |
@@ -136,7 +135,6 @@ namespace OpenSim.Region.Environment.Modules | |||
136 | avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID; | 135 | avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID; |
137 | } | 136 | } |
138 | } | 137 | } |
139 | |||
140 | } | 138 | } |
141 | } | 139 | } |
142 | } | 140 | } |
@@ -159,7 +157,5 @@ namespace OpenSim.Region.Environment.Modules | |||
159 | } | 157 | } |
160 | return visualParams; | 158 | return visualParams; |
161 | } | 159 | } |
162 | |||
163 | |||
164 | } | 160 | } |
165 | } | 161 | } |