diff options
author | Johan Berntsson | 2008-03-04 05:31:54 +0000 |
---|---|---|
committer | Johan Berntsson | 2008-03-04 05:31:54 +0000 |
commit | 279e0061c515ee0a03036bef68eea9738273d785 (patch) | |
tree | 4502228eb7b87a760e0b0e67aded9d1d870d0bed /OpenSim/Framework/SerializableRegionInfo.cs | |
parent | Added copyright heaaders. Minor cleanup. (diff) | |
download | opensim-SC_OLD-279e0061c515ee0a03036bef68eea9738273d785.zip opensim-SC_OLD-279e0061c515ee0a03036bef68eea9738273d785.tar.gz opensim-SC_OLD-279e0061c515ee0a03036bef68eea9738273d785.tar.bz2 opensim-SC_OLD-279e0061c515ee0a03036bef68eea9738273d785.tar.xz |
Merged 3Di code that provides scene and avatar serialization, and plugin support for region move/split/merge. See ThirdParty/3Di/README.txt. Unless the new modules are used there should be no noticeable changes when running OpenSim.
Diffstat (limited to 'OpenSim/Framework/SerializableRegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/SerializableRegionInfo.cs | 60 |
1 files changed, 58 insertions, 2 deletions
diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs index 077ed8d..48ddbdf 100644 --- a/OpenSim/Framework/SerializableRegionInfo.cs +++ b/OpenSim/Framework/SerializableRegionInfo.cs | |||
@@ -51,6 +51,10 @@ namespace OpenSim.Framework | |||
51 | m_remotingPort = ConvertFrom.RemotingPort; | 51 | m_remotingPort = ConvertFrom.RemotingPort; |
52 | m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; | 52 | m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; |
53 | RemotingAddress = ConvertFrom.RemotingAddress; | 53 | RemotingAddress = ConvertFrom.RemotingAddress; |
54 | m_proxyUrl = ConvertFrom.proxyUrl; | ||
55 | OriginRegionID = ConvertFrom.originRegionID; | ||
56 | RegionName = ConvertFrom.RegionName; | ||
57 | ServerURI = ConvertFrom.ServerURI; | ||
54 | } | 58 | } |
55 | 59 | ||
56 | public SearializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) | 60 | public SearializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) |
@@ -157,5 +161,57 @@ namespace OpenSim.Framework | |||
157 | { | 161 | { |
158 | get { return Util.UIntsToLong((RegionLocX * (uint)Constants.RegionSize), (RegionLocY * (uint)Constants.RegionSize)); } | 162 | get { return Util.UIntsToLong((RegionLocX * (uint)Constants.RegionSize), (RegionLocY * (uint)Constants.RegionSize)); } |
159 | } | 163 | } |
160 | } | 164 | |
161 | } \ No newline at end of file | 165 | protected string m_proxyUrl; |
166 | public string ProxyUrl | ||
167 | { | ||
168 | get | ||
169 | { | ||
170 | return m_proxyUrl; | ||
171 | } | ||
172 | set | ||
173 | { | ||
174 | m_proxyUrl = value; | ||
175 | } | ||
176 | } | ||
177 | |||
178 | protected Guid m_originRegionID = LLUUID.Zero.UUID; | ||
179 | public LLUUID OriginRegionID | ||
180 | { | ||
181 | get | ||
182 | { | ||
183 | return new LLUUID(m_originRegionID); | ||
184 | } | ||
185 | set | ||
186 | { | ||
187 | m_originRegionID = value.UUID; | ||
188 | } | ||
189 | } | ||
190 | |||
191 | protected string m_regionName; | ||
192 | public string RegionName | ||
193 | { | ||
194 | get | ||
195 | { | ||
196 | return m_regionName; | ||
197 | } | ||
198 | set | ||
199 | { | ||
200 | m_regionName = value; | ||
201 | } | ||
202 | } | ||
203 | |||
204 | protected string m_serverURI; | ||
205 | public string ServerURI | ||
206 | { | ||
207 | get | ||
208 | { | ||
209 | return m_serverURI; | ||
210 | } | ||
211 | set | ||
212 | { | ||
213 | m_serverURI = value; | ||
214 | } | ||
215 | } | ||
216 | } | ||
217 | } | ||