OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2011-12-24 02:21:35 +00:00
parent b8a914b15b d38b8caf2b
commit c4e16b26bb
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
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();
}
} }

2
OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
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"; */

2
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
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;
} }

3
OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
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)