ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename a few things to reduce confusion between regions wold location and grid location (a lot more elsewhere)

Browse Source
This commit is contained in:
UbitUmarov
2016-07-31 01:56:44 +01:00
parent db7f1aaa2f
commit a4caedceae
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Util.cs
View File

@@ -377,9 +377,11 @@ namespace OpenSim.Framework
return Utils.UIntsToLong(X, Y);
}
public static ulong RegionLocToHandle(uint X, uint Y)
public static ulong RegionGridLocToHandle(uint X, uint Y)
{
return Utils.UIntsToLong(Util.RegionToWorldLoc(X), Util.RegionToWorldLoc(Y));
ulong handle = X << 40; // shift to higher half and mult by 256)
handle |= (Y << 8); // mult by 256)
return handle;
}
public static void RegionHandleToWorldLoc(ulong handle, out uint X, out uint Y)
@@ -1303,7 +1305,7 @@ namespace OpenSim.Framework
}
catch (Exception e)
{
m_log.WarnFormat("[UTILS]: Exception copying configuration file {0} to {1}: {2}", exampleConfigFile, configFile, e.Message);
m_log.WarnFormat("[UTILS]: Exception copying configuration file {0} to {1}: {2}", configFile, exampleConfigFile, e.Message);
return false;
}
}