From b2d6b0a3d42761ca76ac9d5725846567ed579afa Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 27 Oct 2008 01:43:59 +0000
Subject: Update svn properties, minor formatting cleanup.

---
 OpenSim/Data/MSSQL/Resources/009_RegionStore.sql   | 10 ++++-----
 OpenSim/Grid/MessagingServer/Main.cs               |  2 +-
 .../ClientStack/LindenUDP/Tests/TestLLUDPServer.cs | 24 +++++++++++-----------
 .../Modules/Avatar/Concierge/ConciergeModule.cs    |  6 +++---
 4 files changed, 21 insertions(+), 21 deletions(-)
 mode change 100755 => 100644 OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs

(limited to 'OpenSim')

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 @@
-BEGIN TRANSACTION
-
-ALTER TABLE prims ADD Material tinyint NOT NULL default 3
-
-COMMIT
+BEGIN TRANSACTION
+
+ALTER TABLE prims ADD Material tinyint NOT NULL default 3
+
+COMMIT
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
         private void deregisterFromUserServer()
         {
             msgsvc.deregisterWithUserServer();
-            if(m_httpServer != null)
+            if (m_httpServer != null)
             {
                 // try a completely fresh registration, with fresh handlers, too
                 m_httpServer.Stop();
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
old mode 100755
new mode 100644
index 252b2fc..8170150
--- 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
             OnReceivedData(result);
         }                
         
-        /// <summary>
-        /// Has a circuit with the given code been established?
-        /// </summary>
-        /// <param name="circuitCode"></param>
-        /// <returns></returns>
-        public bool HasCircuit(uint circuitCode)
-        {
-            lock (clientCircuits_reverse)
-            {
-                return clientCircuits_reverse.ContainsKey(circuitCode);
-            }                
-        }        
+        /// <summary>
+        /// Has a circuit with the given code been established?
+        /// </summary>
+        /// <param name="circuitCode"></param>
+        /// <returns></returns>
+        public bool HasCircuit(uint circuitCode)
+        {
+            lock (clientCircuits_reverse)
+            {
+                return clientCircuits_reverse.ContainsKey(circuitCode);
+            }
+        }
     }
     
     /// <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
 
         protected void AddToAttendeeList(ScenePresence agent, Scene scene)
         {
-            lock(_sceneAttendees)
+            lock (_sceneAttendees)
             {
                 if (!_sceneAttendees.ContainsKey(scene))
                     _sceneAttendees[scene] = new List<ScenePresence>();
@@ -318,7 +318,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
 
         protected void RemoveFromAttendeeList(ScenePresence agent, Scene scene)
         {
-            lock(_sceneAttendees)
+            lock (_sceneAttendees)
             {
                 if (!_sceneAttendees.ContainsKey(scene))
                 {
@@ -495,4 +495,4 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
             return response;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1