ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-20 22:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge commits, stage 1

Browse Source
This commit is contained in:
Tom
2011-09-04 07:06:36 -07:00
parent 6ab5ca2bda 9f75eaf50e
commit 66dec3b874
267 changed files with 19393 additions and 5645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
View File

@@ -106,7 +106,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule
info.channel = channel;
info.uri = uri;
bool success = SynchronousRestObjectPoster.BeginPostObject<XmlRpcInfo, bool>(
bool success = SynchronousRestObjectRequester.MakeRequest<XmlRpcInfo, bool>(
"POST", m_ServerURI+"/RegisterChannel/", info);
if (!success)
@@ -125,7 +125,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule
if (m_Channels.ContainsKey(itemID))
{
bool success = SynchronousRestObjectPoster.BeginPostObject<UUID, bool>(
bool success = SynchronousRestObjectRequester.MakeRequest<UUID, bool>(
"POST", m_ServerURI+"/RemoveChannel/", m_Channels[itemID]);
if (!success)