aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJeff Ames2008-10-27 01:43:59 +0000
committerJeff Ames2008-10-27 01:43:59 +0000
commitb2d6b0a3d42761ca76ac9d5725846567ed579afa (patch)
tree2712a3dc05ac4dac1bc5a650ecd527499b8a019c /OpenSim
parentThank you kindly, Idb for a patch that solves: (diff)
downloadopensim-SC_OLD-b2d6b0a3d42761ca76ac9d5725846567ed579afa.zip
opensim-SC_OLD-b2d6b0a3d42761ca76ac9d5725846567ed579afa.tar.gz
opensim-SC_OLD-b2d6b0a3d42761ca76ac9d5725846567ed579afa.tar.bz2
opensim-SC_OLD-b2d6b0a3d42761ca76ac9d5725846567ed579afa.tar.xz
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MSSQL/Resources/009_RegionStore.sql10
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs2
-rw-r--r--[-rwxr-xr-x]OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs24
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs6
4 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Data/MSSQL/Resources/009_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/009_RegionStore.sql
index 7efc218..4ef3b3f 100644
--- a/OpenSim/Data/MSSQL/Resources/009_RegionStore.sql
+++ b/OpenSim/Data/MSSQL/Resources/009_RegionStore.sql
@@ -1,5 +1,5 @@
1BEGIN TRANSACTION 1BEGIN TRANSACTION
2 2
3ALTER TABLE prims ADD Material tinyint NOT NULL default 3 3ALTER TABLE prims ADD Material tinyint NOT NULL default 3
4 4
5COMMIT 5COMMIT
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index c188654..998f3fa 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Grid.MessagingServer
101 private void deregisterFromUserServer() 101 private void deregisterFromUserServer()
102 { 102 {
103 msgsvc.deregisterWithUserServer(); 103 msgsvc.deregisterWithUserServer();
104 if(m_httpServer != null) 104 if (m_httpServer != null)
105 { 105 {
106 // try a completely fresh registration, with fresh handlers, too 106 // try a completely fresh registration, with fresh handlers, too
107 m_httpServer.Stop(); 107 m_httpServer.Stop();
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
index 252b2fc..8170150 100755..100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
@@ -89,18 +89,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
89 OnReceivedData(result); 89 OnReceivedData(result);
90 } 90 }
91 91
92 /// <summary> 92 /// <summary>
93 /// Has a circuit with the given code been established? 93 /// Has a circuit with the given code been established?
94 /// </summary> 94 /// </summary>
95 /// <param name="circuitCode"></param> 95 /// <param name="circuitCode"></param>
96 /// <returns></returns> 96 /// <returns></returns>
97 public bool HasCircuit(uint circuitCode) 97 public bool HasCircuit(uint circuitCode)
98 { 98 {
99 lock (clientCircuits_reverse) 99 lock (clientCircuits_reverse)
100 { 100 {
101 return clientCircuits_reverse.ContainsKey(circuitCode); 101 return clientCircuits_reverse.ContainsKey(circuitCode);
102 } 102 }
103 } 103 }
104 } 104 }
105 105
106 /// <summary> 106 /// <summary>
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
index acc25dd..a8d5a21 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
@@ -306,7 +306,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
306 306
307 protected void AddToAttendeeList(ScenePresence agent, Scene scene) 307 protected void AddToAttendeeList(ScenePresence agent, Scene scene)
308 { 308 {
309 lock(_sceneAttendees) 309 lock (_sceneAttendees)
310 { 310 {
311 if (!_sceneAttendees.ContainsKey(scene)) 311 if (!_sceneAttendees.ContainsKey(scene))
312 _sceneAttendees[scene] = new List<ScenePresence>(); 312 _sceneAttendees[scene] = new List<ScenePresence>();
@@ -318,7 +318,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
318 318
319 protected void RemoveFromAttendeeList(ScenePresence agent, Scene scene) 319 protected void RemoveFromAttendeeList(ScenePresence agent, Scene scene)
320 { 320 {
321 lock(_sceneAttendees) 321 lock (_sceneAttendees)
322 { 322 {
323 if (!_sceneAttendees.ContainsKey(scene)) 323 if (!_sceneAttendees.ContainsKey(scene))
324 { 324 {
@@ -495,4 +495,4 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
495 return response; 495 return response;
496 } 496 }
497 } 497 }
498} \ No newline at end of file 498}