diff options
author | Dan Lake | 2011-07-20 15:01:32 -0700 |
---|---|---|
committer | Dan Lake | 2011-07-20 15:01:32 -0700 |
commit | 2c11f7fc38ba14e041ed0e648088d574dadaaffe (patch) | |
tree | d593e3d1130e78ec74a11650d413f451a9a844da /OpenSim/Region/OptionalModules/Scripting | |
parent | Merge branch 'master' into bulletsim (diff) | |
parent | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff) | |
download | opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.zip opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.gz opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.bz2 opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.xz |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs index d18ac0a..2187449 100644 --- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs | |||
@@ -106,7 +106,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule | |||
106 | info.channel = channel; | 106 | info.channel = channel; |
107 | info.uri = uri; | 107 | info.uri = uri; |
108 | 108 | ||
109 | bool success = SynchronousRestObjectPoster.BeginPostObject<XmlRpcInfo, bool>( | 109 | bool success = SynchronousRestObjectRequester.MakeRequest<XmlRpcInfo, bool>( |
110 | "POST", m_ServerURI+"/RegisterChannel/", info); | 110 | "POST", m_ServerURI+"/RegisterChannel/", info); |
111 | 111 | ||
112 | if (!success) | 112 | if (!success) |
@@ -125,7 +125,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule | |||
125 | 125 | ||
126 | if (m_Channels.ContainsKey(itemID)) | 126 | if (m_Channels.ContainsKey(itemID)) |
127 | { | 127 | { |
128 | bool success = SynchronousRestObjectPoster.BeginPostObject<UUID, bool>( | 128 | bool success = SynchronousRestObjectRequester.MakeRequest<UUID, bool>( |
129 | "POST", m_ServerURI+"/RemoveChannel/", m_Channels[itemID]); | 129 | "POST", m_ServerURI+"/RemoveChannel/", m_Channels[itemID]); |
130 | 130 | ||
131 | if (!success) | 131 | if (!success) |