diff options
author | MW | 2007-08-01 16:50:20 +0000 |
---|---|---|
committer | MW | 2007-08-01 16:50:20 +0000 |
commit | edc572dacf3ff65c5584f8c02bb291abce0c7122 (patch) | |
tree | 0e1c8802d3bb8406883d01a1648b20d36215ec4e /OpenSim/Region/Communications | |
parent | remove Adam's work around, this shouldn't be needed any more (diff) | |
download | opensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.zip opensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.gz opensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.bz2 opensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.xz |
Some more work on SceneObject/primitive rewrites (AllNewSceneObjectGroup2 /Part2).
Updated the JavaVM to a later version I did (basically some clean up and a little bit more functional).
Added SendLoadURL method to IClientAPI.
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalUserServices.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index a4cefc4..c351451 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs | |||
@@ -15,6 +15,7 @@ namespace OpenSim.Region.Communications.Local | |||
15 | private NetworkServersInfo serversInfo; | 15 | private NetworkServersInfo serversInfo; |
16 | private uint defaultHomeX ; | 16 | private uint defaultHomeX ; |
17 | private uint defaultHomeY; | 17 | private uint defaultHomeY; |
18 | |||
18 | public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversData) | 19 | public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversData) |
19 | { | 20 | { |
20 | m_Parent = parent; | 21 | m_Parent = parent; |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 69d0d57..eb22b90 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -152,7 +152,6 @@ namespace OpenSim.Region.Communications.OGS1 | |||
152 | { | 152 | { |
153 | return this.regions[regionHandle]; | 153 | return this.regions[regionHandle]; |
154 | } | 154 | } |
155 | //TODO not a region in this instance so ask remote grid server | ||
156 | 155 | ||
157 | Hashtable requestData = new Hashtable(); | 156 | Hashtable requestData = new Hashtable(); |
158 | requestData["region_handle"] = regionHandle.ToString(); | 157 | requestData["region_handle"] = regionHandle.ToString(); |