Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

avinationmerge
Melanie 2011-12-24 01:46:04 +01:00
commit 2e07d24199
4 changed files with 6 additions and 11 deletions

View File

@ -1746,16 +1746,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
grp.ScheduleGroupForFullUpdate(); grp.ScheduleGroupForFullUpdate();
} }
if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent))
{
grp.RootPart.GroupPosition = oldGroupPosition;
grp.ScheduleGroupForFullUpdate();
}
} }

View File

@ -53,7 +53,7 @@ namespace OpenSim.Services.Connectors
public virtual string Helo() public virtual string Helo()
{ {
HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI + "/helo"); HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI + "/helo/");
// Eventually we need to switch to HEAD // Eventually we need to switch to HEAD
/* req.Method = "HEAD"; */ /* req.Method = "HEAD"; */

View File

@ -86,6 +86,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianAssetServiceConnector(string url) public SimianAssetServiceConnector(string url)
{ {
if (!url.EndsWith("/") && !url.EndsWith("="))
url = url + '/';
m_serverUrl = url; m_serverUrl = url;
} }

View File

@ -92,7 +92,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
public SimianInventoryServiceConnector(string url) public SimianInventoryServiceConnector(string url)
{ {
if (!url.EndsWith("/") && !url.EndsWith("="))
url = url + '/';
m_serverUrl = url; m_serverUrl = url;
} }
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)