diff options
| author | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
| commit | 3234472d6203671a492a73042a0b56d6301903e0 (patch) | |
| tree | 2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/Framework/Location.cs | |
| parent | Ensure that the physics representation of a deleted object is also removed (diff) | |
| download | opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.zip opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.gz opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2 opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.xz | |
Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366
Diffstat (limited to 'OpenSim/Framework/Location.cs')
| -rw-r--r-- | OpenSim/Framework/Location.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Location.cs b/OpenSim/Framework/Location.cs index aed2b87..f67543a 100644 --- a/OpenSim/Framework/Location.cs +++ b/OpenSim/Framework/Location.cs | |||
| @@ -50,7 +50,7 @@ namespace OpenSim.Framework | |||
| 50 | 50 | ||
| 51 | public ulong RegionHandle | 51 | public ulong RegionHandle |
| 52 | { | 52 | { |
| 53 | get { return Utils.UIntsToLong((uint)m_x, (uint)m_y); } | 53 | get { return Helpers.UIntsToLong((uint) m_x, (uint) m_y); } |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | public int X | 56 | public int X |