aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Data')
-rw-r--r--OpenSim/Framework/Data/Properties/AssemblyInfo.cs30
-rw-r--r--OpenSim/Framework/Data/RegionProfileData.cs28
-rw-r--r--OpenSim/Framework/Data/ReservationData.cs8
3 files changed, 47 insertions, 19 deletions
diff --git a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
index 51050d1..57cf4cf 100644
--- a/OpenSim/Framework/Data/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data/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("OpenSim.Framework.Data")] 40[assembly : AssemblyProduct("OpenSim.Framework.Data")]
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
diff --git a/OpenSim/Framework/Data/RegionProfileData.cs b/OpenSim/Framework/Data/RegionProfileData.cs
index ec50baa..779e98c 100644
--- a/OpenSim/Framework/Data/RegionProfileData.cs
+++ b/OpenSim/Framework/Data/RegionProfileData.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Data
41 /// <summary> 41 /// <summary>
42 /// The name of the region 42 /// The name of the region
43 /// </summary> 43 /// </summary>
44 public string regionName = ""; 44 public string regionName = String.Empty;
45 45
46 /// <summary> 46 /// <summary>
47 /// A 64-bit number combining map position into a (mostly) unique ID 47 /// A 64-bit number combining map position into a (mostly) unique ID
@@ -65,10 +65,10 @@ namespace OpenSim.Framework.Data
65 /// Authentication secrets 65 /// Authentication secrets
66 /// </summary> 66 /// </summary>
67 /// <remarks>Not very secure, needs improvement.</remarks> 67 /// <remarks>Not very secure, needs improvement.</remarks>
68 public string regionSendKey = ""; 68 public string regionSendKey = String.Empty;
69 69
70 public string regionRecvKey = ""; 70 public string regionRecvKey = String.Empty;
71 public string regionSecret = ""; 71 public string regionSecret = String.Empty;
72 72
73 /// <summary> 73 /// <summary>
74 /// Whether the region is online 74 /// Whether the region is online
@@ -78,14 +78,14 @@ namespace OpenSim.Framework.Data
78 /// <summary> 78 /// <summary>
79 /// Information about the server that the region is currently hosted on 79 /// Information about the server that the region is currently hosted on
80 /// </summary> 80 /// </summary>
81 public string serverIP = ""; 81 public string serverIP = String.Empty;
82 82
83 public uint serverPort; 83 public uint serverPort;
84 public string serverURI = ""; 84 public string serverURI = String.Empty;
85 85
86 public uint httpPort; 86 public uint httpPort;
87 public uint remotingPort; 87 public uint remotingPort;
88 public string httpServerURI = ""; 88 public string httpServerURI = String.Empty;
89 89
90 /// <summary> 90 /// <summary>
91 /// Set of optional overrides. Can be used to create non-eulicidean spaces. 91 /// Set of optional overrides. Can be used to create non-eulicidean spaces.
@@ -100,23 +100,23 @@ namespace OpenSim.Framework.Data
100 /// Optional: URI Location of the region database 100 /// Optional: URI Location of the region database
101 /// </summary> 101 /// </summary>
102 /// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks> 102 /// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks>
103 public string regionDataURI = ""; 103 public string regionDataURI = String.Empty;
104 104
105 /// <summary> 105 /// <summary>
106 /// Region Asset Details 106 /// Region Asset Details
107 /// </summary> 107 /// </summary>
108 public string regionAssetURI = ""; 108 public string regionAssetURI = String.Empty;
109 109
110 public string regionAssetSendKey = ""; 110 public string regionAssetSendKey = String.Empty;
111 public string regionAssetRecvKey = ""; 111 public string regionAssetRecvKey = String.Empty;
112 112
113 /// <summary> 113 /// <summary>
114 /// Region Userserver Details 114 /// Region Userserver Details
115 /// </summary> 115 /// </summary>
116 public string regionUserURI = ""; 116 public string regionUserURI = String.Empty;
117 117
118 public string regionUserSendKey = ""; 118 public string regionUserSendKey = String.Empty;
119 public string regionUserRecvKey = ""; 119 public string regionUserRecvKey = String.Empty;
120 120
121 /// <summary> 121 /// <summary>
122 /// Region Map Texture Asset 122 /// Region Map Texture Asset
diff --git a/OpenSim/Framework/Data/ReservationData.cs b/OpenSim/Framework/Data/ReservationData.cs
index 285f9ca..187ff32 100644
--- a/OpenSim/Framework/Data/ReservationData.cs
+++ b/OpenSim/Framework/Data/ReservationData.cs
@@ -37,11 +37,11 @@ namespace OpenSim.Framework.Data
37 public int reservationMaxX = 65536; 37 public int reservationMaxX = 65536;
38 public int reservationMaxY = 65536; 38 public int reservationMaxY = 65536;
39 39
40 public string reservationName = ""; 40 public string reservationName = System.String.Empty;
41 public string reservationCompany = ""; 41 public string reservationCompany = System.String.Empty;
42 public bool status = true; 42 public bool status = true;
43 43
44 public string gridSendKey = ""; 44 public string gridSendKey = System.String.Empty;
45 public string gridRecvKey = ""; 45 public string gridRecvKey = System.String.Empty;
46 } 46 }
47} \ No newline at end of file 47} \ No newline at end of file