aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs30
3 files changed, 33 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index e1d29bc..e3d10b5 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Communications.OGS1
55 public BaseHttpServer httpListener; 55 public BaseHttpServer httpListener;
56 public NetworkServersInfo serversInfo; 56 public NetworkServersInfo serversInfo;
57 public BaseHttpServer httpServer; 57 public BaseHttpServer httpServer;
58 public string _gdebugRegionName = ""; 58 public string _gdebugRegionName = String.Empty;
59 59
60 public string gdebugRegionName 60 public string gdebugRegionName
61 { 61 {
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Communications.OGS1
63 set { _gdebugRegionName = value; } 63 set { _gdebugRegionName = value; }
64 } 64 }
65 65
66 public string _rdebugRegionName = ""; 66 public string _rdebugRegionName = String.Empty;
67 67
68 public string rdebugRegionName 68 public string rdebugRegionName
69 { 69 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index e645074..36ab4bb 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Communications.OGS1
144 { 144 {
145 Hashtable param = new Hashtable(); 145 Hashtable param = new Hashtable();
146 param["queryid"] = (string) queryID.ToString(); 146 param["queryid"] = (string) queryID.ToString();
147 param["avquery"] = objAlphaNumericPattern.Replace(query, ""); 147 param["avquery"] = objAlphaNumericPattern.Replace(query, String.Empty);
148 IList parameters = new ArrayList(); 148 IList parameters = new ArrayList();
149 parameters.Add(param); 149 parameters.Add(param);
150 XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters); 150 XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters);
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Communications.OGS1
212 212
213 public UserProfileData SetupMasterUser(string firstName, string lastName) 213 public UserProfileData SetupMasterUser(string firstName, string lastName)
214 { 214 {
215 return SetupMasterUser(firstName, lastName, ""); 215 return SetupMasterUser(firstName, lastName, String.Empty);
216 } 216 }
217 217
218 public UserProfileData SetupMasterUser(string firstName, string lastName, string password) 218 public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
diff --git a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
index 631cfd0..2aa5739 100644
--- a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
@@ -1,3 +1,31 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
1using System.Reflection; 29using System.Reflection;
2using System.Runtime.InteropServices; 30using System.Runtime.InteropServices;
3 31
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices;
10[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
11[assembly : AssemblyCompany("")] 39[assembly : AssemblyCompany("")]
12[assembly : AssemblyProduct("OpenGrid.Framework.Communications.OGS1")] 40[assembly : AssemblyProduct("OpenGrid.Framework.Communications.OGS1")]
13[assembly : AssemblyCopyright("Copyright © 2007")] 41[assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")]
14[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
16 44