diff options
author | Teravus Ovares | 2008-03-30 08:01:47 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-03-30 08:01:47 +0000 |
commit | fd2caf5f1673ad14702d89db9804f841c5cb861a (patch) | |
tree | 18fd4ae03180b14df41f93544afa0cc9d5ec5309 /OpenSim/Framework/RegionInfo.cs | |
parent | * Stop the grid inventory service sending all folder and item details twice (diff) | |
download | opensim-SC-fd2caf5f1673ad14702d89db9804f841c5cb861a.zip opensim-SC-fd2caf5f1673ad14702d89db9804f841c5cb861a.tar.gz opensim-SC-fd2caf5f1673ad14702d89db9804f841c5cb861a.tar.bz2 opensim-SC-fd2caf5f1673ad14702d89db9804f841c5cb861a.tar.xz |
This update has good news and bad news, first the bad.
* This update breaks inter-region communications, sorry.
* You will need to run prebuild.
Next, the good;
* This update solves the unexpected binary element when Linux simulators inform windows simulators and vice versa. So Linux Simulators and Windows simulators are 100% compatible again.
* This update introduces an Integer in the prim crossing method to tell the receiving simulator which XML method to use to load the prim that crossed the border. If the receiving prim doesn't support the method, the prim crossing fails and no prims are lost.
That being said, it's best to update all your simulators to this revision at once.
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index fc6da57..095740d 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -101,6 +101,12 @@ namespace OpenSim.Framework | |||
101 | public bool m_allow_alternate_ports; | 101 | public bool m_allow_alternate_ports; |
102 | 102 | ||
103 | protected string m_serverURI; | 103 | protected string m_serverURI; |
104 | |||
105 | public int getInternalEndPointPort() | ||
106 | { | ||
107 | return m_internalEndPoint.Port; | ||
108 | } | ||
109 | |||
104 | public string ServerURI | 110 | public string ServerURI |
105 | { | 111 | { |
106 | get | 112 | get |
@@ -279,6 +285,17 @@ namespace OpenSim.Framework | |||
279 | RegionID = LLUUID.Zero; | 285 | RegionID = LLUUID.Zero; |
280 | ServerURI = ConvertFrom.ServerURI; | 286 | ServerURI = ConvertFrom.ServerURI; |
281 | } | 287 | } |
288 | public int getInternalEndPointPort() | ||
289 | { | ||
290 | return m_internalEndPoint.Port; | ||
291 | } | ||
292 | public void SetEndPoint(string ipaddr, int port) | ||
293 | { | ||
294 | IPAddress tmpIP = IPAddress.Parse(ipaddr); | ||
295 | IPEndPoint tmpEPE= new IPEndPoint(tmpIP, port); | ||
296 | m_internalEndPoint = tmpEPE; | ||
297 | |||
298 | } | ||
282 | 299 | ||
283 | //not in use, should swap to nini though. | 300 | //not in use, should swap to nini though. |
284 | public void LoadFromNiniSource(IConfigSource source) | 301 | public void LoadFromNiniSource(IConfigSource source) |