diff options
author | Robert Adams | 2013-11-28 08:20:16 -0800 |
---|---|---|
committer | Robert Adams | 2013-11-28 08:20:16 -0800 |
commit | 7aa00632b90f9c24ff6b0fa0da385744a6573c32 (patch) | |
tree | bc63b12b893d3842932e4d0a3def8ed038288004 /OpenSim/Framework | |
parent | Merge branch 'master' into varregion (diff) | |
download | opensim-SC_OLD-7aa00632b90f9c24ff6b0fa0da385744a6573c32.zip opensim-SC_OLD-7aa00632b90f9c24ff6b0fa0da385744a6573c32.tar.gz opensim-SC_OLD-7aa00632b90f9c24ff6b0fa0da385744a6573c32.tar.bz2 opensim-SC_OLD-7aa00632b90f9c24ff6b0fa0da385744a6573c32.tar.xz |
varregion: many replacements of in-place arithmetic with calls to
the Util functions for converting world addresses to region addresses
and converting region handles to locations.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Util.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 105e75d..2276951 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -336,6 +336,7 @@ namespace OpenSim.Framework | |||
336 | // Regions are identified with a 'handle' made up of its region coordinates packed into a ulong. | 336 | // Regions are identified with a 'handle' made up of its region coordinates packed into a ulong. |
337 | // Several places rely on the ability to extract a region's location from its handle. | 337 | // Several places rely on the ability to extract a region's location from its handle. |
338 | // Note the location is in 'world coordinates' (see below). | 338 | // Note the location is in 'world coordinates' (see below). |
339 | // Region handles are based on the lowest coordinate of the region so trim the passed x,y to be the regions 0,0. | ||
339 | public static ulong RegionWorldLocToHandle(uint X, uint Y) | 340 | public static ulong RegionWorldLocToHandle(uint X, uint Y) |
340 | { | 341 | { |
341 | return Utils.UIntsToLong(X, Y); | 342 | return Utils.UIntsToLong(X, Y); |