diff options
Diffstat (limited to '')
7 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs index 89eecf8..f03e5fc 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs | |||
@@ -404,7 +404,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
404 | 404 | ||
405 | private bool IsAConnectionMatchFor(ChannelState cs) | 405 | private bool IsAConnectionMatchFor(ChannelState cs) |
406 | { | 406 | { |
407 | return ( | 407 | return ( |
408 | Server == cs.Server && | 408 | Server == cs.Server && |
409 | IrcChannel == cs.IrcChannel && | 409 | IrcChannel == cs.IrcChannel && |
410 | Port == cs.Port && | 410 | Port == cs.Port && |
@@ -419,7 +419,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
419 | 419 | ||
420 | private bool IsAPerfectMatchFor(ChannelState cs) | 420 | private bool IsAPerfectMatchFor(ChannelState cs) |
421 | { | 421 | { |
422 | return ( IsAConnectionMatchFor(cs) && | 422 | return (IsAConnectionMatchFor(cs) && |
423 | RelayChannelOut == cs.RelayChannelOut && | 423 | RelayChannelOut == cs.RelayChannelOut && |
424 | PrivateMessageFormat == cs.PrivateMessageFormat && | 424 | PrivateMessageFormat == cs.PrivateMessageFormat && |
425 | NoticeMessageFormat == cs.NoticeMessageFormat && | 425 | NoticeMessageFormat == cs.NoticeMessageFormat && |
@@ -598,7 +598,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
598 | { | 598 | { |
599 | foreach (ChannelState cs in IRCBridgeModule.m_channels) | 599 | foreach (ChannelState cs in IRCBridgeModule.m_channels) |
600 | { | 600 | { |
601 | if ( p_irc == cs.irc) | 601 | if (p_irc == cs.irc) |
602 | { | 602 | { |
603 | 603 | ||
604 | // This non-IRC differentiator moved to here | 604 | // This non-IRC differentiator moved to here |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs index eee122b..caec43d 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs | |||
@@ -147,7 +147,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
147 | response["content_type"] = "text/xml"; | 147 | response["content_type"] = "text/xml"; |
148 | response["keepalive"] = false; | 148 | response["keepalive"] = false; |
149 | response["int_response_code"] = 200; | 149 | response["int_response_code"] = 200; |
150 | response["str_response_string"] = String.Format( | 150 | response["str_response_string"] = String.Format( |
151 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + | 151 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + |
152 | "<document type=\"freeswitch/xml\">\r\n" + | 152 | "<document type=\"freeswitch/xml\">\r\n" + |
153 | "<section name=\"directory\" description=\"User Directory\">\r\n" + | 153 | "<section name=\"directory\" description=\"User Directory\">\r\n" + |
@@ -184,7 +184,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
184 | response["content_type"] = "text/xml"; | 184 | response["content_type"] = "text/xml"; |
185 | response["keepalive"] = false; | 185 | response["keepalive"] = false; |
186 | response["int_response_code"] = 200; | 186 | response["int_response_code"] = 200; |
187 | response["str_response_string"] = String.Format( | 187 | response["str_response_string"] = String.Format( |
188 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + | 188 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + |
189 | "<document type=\"freeswitch/xml\">\r\n" + | 189 | "<document type=\"freeswitch/xml\">\r\n" + |
190 | "<section name=\"directory\" description=\"User Directory\">\r\n" + | 190 | "<section name=\"directory\" description=\"User Directory\">\r\n" + |
@@ -230,7 +230,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
230 | response["content_type"] = "text/xml"; | 230 | response["content_type"] = "text/xml"; |
231 | response["keepalive"] = false; | 231 | response["keepalive"] = false; |
232 | response["int_response_code"] = 200; | 232 | response["int_response_code"] = 200; |
233 | response["str_response_string"] = String.Format( | 233 | response["str_response_string"] = String.Format( |
234 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + | 234 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + |
235 | "<document type=\"freeswitch/xml\">\r\n" + | 235 | "<document type=\"freeswitch/xml\">\r\n" + |
236 | "<section name=\"directory\" description=\"User Directory\">\r\n" + | 236 | "<section name=\"directory\" description=\"User Directory\">\r\n" + |
@@ -263,7 +263,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
263 | response["content_type"] = "text/xml"; | 263 | response["content_type"] = "text/xml"; |
264 | response["keepalive"] = false; | 264 | response["keepalive"] = false; |
265 | response["int_response_code"] = 200; | 265 | response["int_response_code"] = 200; |
266 | response["str_response_string"] = String.Format( | 266 | response["str_response_string"] = String.Format( |
267 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + | 267 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + |
268 | "<document type=\"freeswitch/xml\">\r\n" + | 268 | "<document type=\"freeswitch/xml\">\r\n" + |
269 | "<section name=\"directory\" description=\"User Directory\">\r\n" + | 269 | "<section name=\"directory\" description=\"User Directory\">\r\n" + |
@@ -317,7 +317,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
317 | // response["content_type"] = "text/xml"; | 317 | // response["content_type"] = "text/xml"; |
318 | // response["keepalive"] = false; | 318 | // response["keepalive"] = false; |
319 | // response["int_response_code"] = 200; | 319 | // response["int_response_code"] = 200; |
320 | // response["str_response_string"] = String.Format( | 320 | // response["str_response_string"] = String.Format( |
321 | // "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + | 321 | // "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + |
322 | // "<document type=\"freeswitch/xml\">\r\n" + | 322 | // "<document type=\"freeswitch/xml\">\r\n" + |
323 | // "<section name=\"directory\" description=\"User Directory\">\r\n" + | 323 | // "<section name=\"directory\" description=\"User Directory\">\r\n" + |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index 84d7c4c..de78f5f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -556,7 +556,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
556 | response["content_type"] = "text/xml"; | 556 | response["content_type"] = "text/xml"; |
557 | response["keepalive"] = false; | 557 | response["keepalive"] = false; |
558 | 558 | ||
559 | response["str_response_string"] = String.Format( | 559 | response["str_response_string"] = String.Format( |
560 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + | 560 | "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" + |
561 | "<VCConfiguration>\r\n"+ | 561 | "<VCConfiguration>\r\n"+ |
562 | "<DefaultRealm>{0}</DefaultRealm>\r\n" + | 562 | "<DefaultRealm>{0}</DefaultRealm>\r\n" + |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs index 5d8760f..bc421c2 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs | |||
@@ -1234,7 +1234,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1234 | // UDP version doesn't seem to behave nicely. But we're going to send it out here | 1234 | // UDP version doesn't seem to behave nicely. But we're going to send it out here |
1235 | // with an empty group membership to hopefully remove groups being displayed due | 1235 | // with an empty group membership to hopefully remove groups being displayed due |
1236 | // to the core Groups Stub | 1236 | // to the core Groups Stub |
1237 | remoteClient.SendGroupMembership( new GroupMembershipData[0] ); | 1237 | remoteClient.SendGroupMembership(new GroupMembershipData[0]); |
1238 | 1238 | ||
1239 | GroupMembershipData[] membershipData = m_groupData.GetAgentGroupMemberships(GetClientGroupRequestID(remoteClient), dataForAgentID).ToArray(); | 1239 | GroupMembershipData[] membershipData = m_groupData.GetAgentGroupMemberships(GetClientGroupRequestID(remoteClient), dataForAgentID).ToArray(); |
1240 | 1240 | ||
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs index 582dc0f..52c4e03 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs | |||
@@ -115,7 +115,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
115 | { | 115 | { |
116 | m_log.Debug("[CONTENT MANAG] saving " + scene.RegionInfo.RegionName + " with log message: " + logMessage + " length of message: " + logMessage.Length); | 116 | m_log.Debug("[CONTENT MANAG] saving " + scene.RegionInfo.RegionName + " with log message: " + logMessage + " length of message: " + logMessage.Length); |
117 | m_database.SaveRegion(scene.RegionInfo.RegionID, scene.RegionInfo.RegionName, logMessage); | 117 | m_database.SaveRegion(scene.RegionInfo.RegionID, scene.RegionInfo.RegionName, logMessage); |
118 | m_log.Debug("[CONTENT MANAG] the region name we are dealing with heeeeeeeere: " + scene.RegionInfo.RegionName ); | 118 | m_log.Debug("[CONTENT MANAG] the region name we are dealing with heeeeeeeere: " + scene.RegionInfo.RegionName); |
119 | } | 119 | } |
120 | 120 | ||
121 | public void DeleteAllMetaObjects() | 121 | public void DeleteAllMetaObjects() |
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs index 9a91fbf..a3d7977 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs | |||
@@ -123,7 +123,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
123 | { | 123 | { |
124 | String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + | 124 | String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + |
125 | Slash.DirectorySeparatorChar + "heightmap.r32"; | 125 | Slash.DirectorySeparatorChar + "heightmap.r32"; |
126 | FileStream fs = new FileStream( filename, FileMode.Open); | 126 | FileStream fs = new FileStream(filename, FileMode.Open); |
127 | StreamReader sr = new StreamReader(fs); | 127 | StreamReader sr = new StreamReader(fs); |
128 | String result = sr.ReadToEnd(); | 128 | String result = sr.ReadToEnd(); |
129 | sr.Close(); | 129 | sr.Close(); |
@@ -135,7 +135,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
135 | { | 135 | { |
136 | String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + | 136 | String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + |
137 | Slash.DirectorySeparatorChar + "heightmap.r32"; | 137 | Slash.DirectorySeparatorChar + "heightmap.r32"; |
138 | FileStream fs = new FileStream( filename, FileMode.Open); | 138 | FileStream fs = new FileStream(filename, FileMode.Open); |
139 | StreamReader sr = new StreamReader(fs); | 139 | StreamReader sr = new StreamReader(fs); |
140 | String result = sr.ReadToEnd(); | 140 | String result = sr.ReadToEnd(); |
141 | sr.Close(); | 141 | sr.Close(); |
@@ -232,7 +232,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
232 | try | 232 | try |
233 | { | 233 | { |
234 | logLocation = revisionDir + Slash.DirectorySeparatorChar + "log"; | 234 | logLocation = revisionDir + Slash.DirectorySeparatorChar + "log"; |
235 | fs = new FileStream( logLocation, FileMode.Open); | 235 | fs = new FileStream(logLocation, FileMode.Open); |
236 | sr = new StreamReader(fs); | 236 | sr = new StreamReader(fs); |
237 | logMessage = sr.ReadToEnd(); | 237 | logMessage = sr.ReadToEnd(); |
238 | sr.Close(); | 238 | sr.Close(); |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs index c1c255b..a40a0d9 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | |||
@@ -170,7 +170,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
170 | SceneObjectPart sop = GetSOP(); | 170 | SceneObjectPart sop = GetSOP(); |
171 | IObjectMaterial[] rets = new IObjectMaterial[getNumberOfSides(sop)]; | 171 | IObjectMaterial[] rets = new IObjectMaterial[getNumberOfSides(sop)]; |
172 | 172 | ||
173 | for (int i = 0; i < rets.Length;i++ ) | 173 | for (int i = 0; i < rets.Length; i++) |
174 | { | 174 | { |
175 | rets[i] = new SOPObjectMaterial(i, sop); | 175 | rets[i] = new SOPObjectMaterial(i, sop); |
176 | } | 176 | } |