diff options
| author | Diva Canto | 2009-09-28 17:35:26 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-09-28 17:35:26 -0700 |
| commit | 51d9f7ebd4286709e75f6fcceff6fb75a4a83c46 (patch) | |
| tree | 032929778f7dc07b560c75da262f285476a44450 /OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |
| parent | Improved the Local grid connector to fetch data from the DB when it doesn't f... (diff) | |
| parent | Convert DOS newlines to Unix newlines. (diff) | |
| download | opensim-SC_OLD-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.zip opensim-SC_OLD-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.tar.gz opensim-SC_OLD-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.tar.bz2 opensim-SC_OLD-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')
| -rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 0873035..56eb359 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
| @@ -171,7 +171,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
| 171 | 171 | ||
| 172 | } | 172 | } |
| 173 | 173 | ||
| 174 | private ulong GetMeshKey( PrimitiveBaseShape pbs, PhysicsVector size, float lod ) | 174 | private ulong GetMeshKey(PrimitiveBaseShape pbs, PhysicsVector size, float lod) |
| 175 | { | 175 | { |
| 176 | ulong hash = 5381; | 176 | ulong hash = 5381; |
| 177 | 177 | ||