diff options
author | Jeff Ames | 2009-05-05 09:59:15 +0000 |
---|---|---|
committer | Jeff Ames | 2009-05-05 09:59:15 +0000 |
commit | 8ea12ad6c06ec9cce4bc470b40079546f18b61c8 (patch) | |
tree | 7040d88a5dc67e31495d4de802ce5bba8f9b1df8 /OpenSim/ApplicationPlugins | |
parent | Update svn properties. (diff) | |
download | opensim-SC_OLD-8ea12ad6c06ec9cce4bc470b40079546f18b61c8.zip opensim-SC_OLD-8ea12ad6c06ec9cce4bc470b40079546f18b61c8.tar.gz opensim-SC_OLD-8ea12ad6c06ec9cce4bc470b40079546f18b61c8.tar.bz2 opensim-SC_OLD-8ea12ad6c06ec9cce4bc470b40079546f18b61c8.tar.xz |
Add copyright header. Formatting cleanup. Ignore some generated files.
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r-- | OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 2 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 39c0066..3ad137e 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | |||
@@ -245,7 +245,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
245 | 245 | ||
246 | m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); | 246 | m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); |
247 | m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); | 247 | m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); |
248 | if(m_openSim.userStatsURI != String.Empty ) | 248 | if (m_openSim.userStatsURI != String.Empty ) |
249 | m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); | 249 | m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); |
250 | } | 250 | } |
251 | 251 | ||
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index e14843b..1daa07f 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -413,9 +413,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
413 | private bool getBoolean(Hashtable requestData, string tag, bool defv) | 413 | private bool getBoolean(Hashtable requestData, string tag, bool defv) |
414 | { | 414 | { |
415 | // If an access value has been provided, apply it. | 415 | // If an access value has been provided, apply it. |
416 | if(requestData.Contains(tag)) | 416 | if (requestData.Contains(tag)) |
417 | { | 417 | { |
418 | switch(((string)requestData[tag]).ToLower()) | 418 | switch (((string)requestData[tag]).ToLower()) |
419 | { | 419 | { |
420 | case "true" : | 420 | case "true" : |
421 | case "t" : | 421 | case "t" : |
@@ -670,7 +670,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
670 | { | 670 | { |
671 | List<ILandObject> parcels = ((Scene)newscene).LandChannel.AllParcels(); | 671 | List<ILandObject> parcels = ((Scene)newscene).LandChannel.AllParcels(); |
672 | 672 | ||
673 | foreach(ILandObject parcel in parcels) | 673 | foreach (ILandObject parcel in parcels) |
674 | { | 674 | { |
675 | parcel.landData.Flags |= (uint) Parcel.ParcelFlags.AllowVoiceChat; | 675 | parcel.landData.Flags |= (uint) Parcel.ParcelFlags.AllowVoiceChat; |
676 | parcel.landData.Flags |= (uint) Parcel.ParcelFlags.UseEstateVoiceChan; | 676 | parcel.landData.Flags |= (uint) Parcel.ParcelFlags.UseEstateVoiceChan; |
@@ -826,7 +826,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
826 | bool enableVoice = getBoolean(requestData, "enable_voice", true); | 826 | bool enableVoice = getBoolean(requestData, "enable_voice", true); |
827 | List<ILandObject> parcels = ((Scene)scene).LandChannel.AllParcels(); | 827 | List<ILandObject> parcels = ((Scene)scene).LandChannel.AllParcels(); |
828 | 828 | ||
829 | foreach(ILandObject parcel in parcels) | 829 | foreach (ILandObject parcel in parcels) |
830 | { | 830 | { |
831 | if (enableVoice) | 831 | if (enableVoice) |
832 | { | 832 | { |