aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMW2007-09-08 07:50:31 +0000
committerMW2007-09-08 07:50:31 +0000
commitc29df824c2db40ccdfbaf7ac6f166c578d77db3a (patch)
tree1e9513d9c5f8d9da48ece5ce796f4d80b5796d82 /OpenSim/Framework
parentadded SQLiteAssetData class first pass. This should work, (diff)
downloadopensim-SC-c29df824c2db40ccdfbaf7ac6f166c578d77db3a.zip
opensim-SC-c29df824c2db40ccdfbaf7ac6f166c578d77db3a.tar.gz
opensim-SC-c29df824c2db40ccdfbaf7ac6f166c578d77db3a.tar.bz2
opensim-SC-c29df824c2db40ccdfbaf7ac6f166c578d77db3a.tar.xz
Converted the LSL scripting engine into a IRegionModule, so now all "modules" share a common base interface and are loaded from the single loader. (It seems to work fine, but I have left the old scriptengine loader, incase we have to change back).
Removed the reference to OpenJpeg in the DynamicTextureModule, to see if that was causing the build problem someone is having. Added a Temporary fix for the "existing connection was forcibly closed by the remote host" exception on windows when a user logs out of a multiregion instance. Some early work to prepare for improving the way clients are updated (about prims etc).
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/General/Util.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs
index 5eae206..1ec7d78 100644
--- a/OpenSim/Framework/General/Util.cs
+++ b/OpenSim/Framework/General/Util.cs
@@ -152,15 +152,15 @@ namespace OpenSim.Framework.Utilities
152 return capsPath; 152 return capsPath;
153 } 153 }
154 154
155 //public static int fast_distance2d(int x, int y) 155 public static int fast_distance2d(int x, int y)
156 //{ 156 {
157 // x = System.Math.Abs(x); 157 x = System.Math.Abs(x);
158 // y = System.Math.Abs(y); 158 y = System.Math.Abs(y);
159 159
160 // int min = System.Math.Min(x, y); 160 int min = System.Math.Min(x, y);
161 161
162 // return (x + y - (min >> 1) - (min >> 2) + (min >> 4)); 162 return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
163 //} 163 }
164 164
165 public static string FieldToString(byte[] bytes) 165 public static string FieldToString(byte[] bytes)
166 { 166 {