OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties, minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-10-27 01:43:59 +00:00
parent a59ca765fe
commit b2d6b0a3d4
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Data/MSSQL/Resources/009_RegionStore.sql
View File

@ -1,5 +1,5 @@
BEGIN TRANSACTION BEGIN TRANSACTION
ALTER TABLE prims ADD Material tinyint NOT NULL default 3 ALTER TABLE prims ADD Material tinyint NOT NULL default 3
COMMIT COMMIT

2
OpenSim/Grid/MessagingServer/Main.cs
View File

@ -101,7 +101,7 @@ namespace OpenSim.Grid.MessagingServer
private void deregisterFromUserServer() private void deregisterFromUserServer()
{ {
msgsvc.deregisterWithUserServer(); msgsvc.deregisterWithUserServer();
if(m_httpServer != null) if (m_httpServer != null)
{ {
// try a completely fresh registration, with fresh handlers, too // try a completely fresh registration, with fresh handlers, too
m_httpServer.Stop(); m_httpServer.Stop();

24
OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs Executable file → Normal file
View File

@ -89,18 +89,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
OnReceivedData(result); OnReceivedData(result);
} }
/// <summary> /// <summary>
/// Has a circuit with the given code been established? /// Has a circuit with the given code been established?
/// </summary> /// </summary>
/// <param name="circuitCode"></param> /// <param name="circuitCode"></param>
/// <returns></returns> /// <returns></returns>
public bool HasCircuit(uint circuitCode) public bool HasCircuit(uint circuitCode)
{ {
lock (clientCircuits_reverse) lock (clientCircuits_reverse)
{ {
return clientCircuits_reverse.ContainsKey(circuitCode); return clientCircuits_reverse.ContainsKey(circuitCode);
} }
} }
} }
/// <summary> /// <summary>

6
OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
View File

@ -306,7 +306,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
protected void AddToAttendeeList(ScenePresence agent, Scene scene) protected void AddToAttendeeList(ScenePresence agent, Scene scene)
{ {
lock(_sceneAttendees) lock (_sceneAttendees)
{ {
if (!_sceneAttendees.ContainsKey(scene)) if (!_sceneAttendees.ContainsKey(scene))
_sceneAttendees[scene] = new List<ScenePresence>(); _sceneAttendees[scene] = new List<ScenePresence>();
@ -318,7 +318,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
protected void RemoveFromAttendeeList(ScenePresence agent, Scene scene) protected void RemoveFromAttendeeList(ScenePresence agent, Scene scene)
{ {
lock(_sceneAttendees) lock (_sceneAttendees)
{ {
if (!_sceneAttendees.ContainsKey(scene)) if (!_sceneAttendees.ContainsKey(scene))
{ {
@ -495,4 +495,4 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
return response; return response;
} }
} }
} }