diff options
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 1 | ||||
-rw-r--r-- | OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 81197fd..9800b74 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -482,6 +482,7 @@ namespace OpenSim.Grid.GridServer | |||
482 | simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString(); | 482 | simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString(); |
483 | simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString(); | 483 | simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString(); |
484 | simProfileBlock["uuid"] = aSim.Value.UUID.ToStringHyphenated(); | 484 | simProfileBlock["uuid"] = aSim.Value.UUID.ToStringHyphenated(); |
485 | simProfileBlock["remoting_port"] = aSim.Value.remotingPort; | ||
485 | 486 | ||
486 | simProfileList.Add(simProfileBlock); | 487 | simProfileList.Add(simProfileBlock); |
487 | } | 488 | } |
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs index 90fe2cf..e5728fe 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs | |||
@@ -1168,7 +1168,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler | |||
1168 | if (dynamicID == "") | 1168 | if (dynamicID == "") |
1169 | { | 1169 | { |
1170 | IDynamicTextureManager textureManager = this.World.RequestModuleInterface<IDynamicTextureManager>(); | 1170 | IDynamicTextureManager textureManager = this.World.RequestModuleInterface<IDynamicTextureManager>(); |
1171 | LLUUID createdTexture = textureManager.AddDynamicTextureURL(World.RegionInfo.SimUUID, this.m_host.UUID, contentType, url, extraParams, timer); | 1171 | LLUUID createdTexture = textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, this.m_host.UUID, contentType, url, extraParams, timer); |
1172 | return createdTexture.ToStringHyphenated(); | 1172 | return createdTexture.ToStringHyphenated(); |
1173 | } | 1173 | } |
1174 | else | 1174 | else |