diff options
author | lbsa71 | 2007-05-16 17:12:17 +0000 |
---|---|---|
committer | lbsa71 | 2007-05-16 17:12:17 +0000 |
commit | 6056247ac3002808c95d7a1c6671c388920ec2ed (patch) | |
tree | cc9c6aa96868ba71dab8cee92f904b51315156c9 /OpenSim.Framework | |
parent | Yet more cleanup/refactoring (diff) | |
download | opensim-SC-6056247ac3002808c95d7a1c6671c388920ec2ed.zip opensim-SC-6056247ac3002808c95d7a1c6671c388920ec2ed.tar.gz opensim-SC-6056247ac3002808c95d7a1c6671c388920ec2ed.tar.bz2 opensim-SC-6056247ac3002808c95d7a1c6671c388920ec2ed.tar.xz |
* removed unused new-login.dat
* cleared up verbose/noverbose/disableOutput douple negation confusion in ConsoleBase
* 2d chat radius is now 3d chat sphere
* removed unused fast 2d radius calc
* added chat type 0xFF : broadcast (no sphere checking)
* OpenSimMain now exposes its LocalWorld
Diffstat (limited to 'OpenSim.Framework')
-rw-r--r-- | OpenSim.Framework/Util.cs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/OpenSim.Framework/Util.cs b/OpenSim.Framework/Util.cs index 17ca611..5bf7ff9 100644 --- a/OpenSim.Framework/Util.cs +++ b/OpenSim.Framework/Util.cs | |||
@@ -36,15 +36,15 @@ namespace OpenSim.Framework.Utilities | |||
36 | return id; | 36 | return id; |
37 | } | 37 | } |
38 | 38 | ||
39 | public static int fast_distance2d(int x, int y) | 39 | //public static int fast_distance2d(int x, int y) |
40 | { | 40 | //{ |
41 | x = System.Math.Abs(x); | 41 | // x = System.Math.Abs(x); |
42 | y = System.Math.Abs(y); | 42 | // y = System.Math.Abs(y); |
43 | 43 | ||
44 | int min = System.Math.Min(x, y); | 44 | // int min = System.Math.Min(x, y); |
45 | 45 | ||
46 | return (x + y - (min >> 1) - (min >> 2) + (min >> 4)); | 46 | // return (x + y - (min >> 1) - (min >> 2) + (min >> 4)); |
47 | } | 47 | //} |
48 | 48 | ||
49 | public static string FieldToString(byte[] bytes) | 49 | public static string FieldToString(byte[] bytes) |
50 | { | 50 | { |
@@ -130,5 +130,4 @@ namespace OpenSim.Framework.Utilities | |||
130 | 130 | ||
131 | } | 131 | } |
132 | } | 132 | } |
133 | |||
134 | } | 133 | } |