diff options
author | Justin Clarke Casey | 2008-08-26 18:44:34 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-08-26 18:44:34 +0000 |
commit | 8462c8c4974060ceb83e63e39963c98327c4f537 (patch) | |
tree | 2c841bad6e41b635ce1fa544d845a1624e0e07ad /OpenSim/Region/Environment | |
parent | * On loading archives, report an error if an asset does not have the expected... (diff) | |
download | opensim-SC_OLD-8462c8c4974060ceb83e63e39963c98327c4f537.zip opensim-SC_OLD-8462c8c4974060ceb83e63e39963c98327c4f537.tar.gz opensim-SC_OLD-8462c8c4974060ceb83e63e39963c98327c4f537.tar.bz2 opensim-SC_OLD-8462c8c4974060ceb83e63e39963c98327c4f537.tar.xz |
* Eliminate commented out code no longer needed, as discussed on the ml
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index 89a01f0..ce3c62f 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -24,6 +24,7 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | |||
27 | using System; | 28 | using System; |
28 | using System.Collections; | 29 | using System.Collections; |
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
@@ -746,36 +747,6 @@ namespace OpenSim.Region.Environment.Modules.InterGrid | |||
746 | return Util.UIntsToLong(reg.RegionLocX, reg.RegionLocY); | 747 | return Util.UIntsToLong(reg.RegionLocX, reg.RegionLocY); |
747 | } | 748 | } |
748 | 749 | ||
749 | // private ulong GetOSCompatibleRegionHandle(uint x, uint y) | ||
750 | // { | ||
751 | // return Util.UIntsToLong(x, y); | ||
752 | // } | ||
753 | |||
754 | // private ulong GetOSCompatibleRegionHandle(ulong regionhandle) | ||
755 | // { | ||
756 | // uint x,y; | ||
757 | // Helpers.LongToUInts(regionhandle,out x, out y); | ||
758 | // return GetOSCompatibleRegionHandle(x,y); | ||
759 | // } | ||
760 | |||
761 | |||
762 | // private ulong GetOGPCompatibleRegionHandle(RegionInfo reg) | ||
763 | // { | ||
764 | // return Util.UIntsToLong((reg.RegionLocX * (uint)Constants.RegionSize), (reg.RegionLocY * (uint)Constants.RegionSize)); | ||
765 | // } | ||
766 | |||
767 | // private ulong GetOGPCompatibleRegionHandle(uint x, uint y) | ||
768 | // { | ||
769 | // return Util.UIntsToLong((x * (uint)Constants.RegionSize), (y * (uint)Constants.RegionSize)); | ||
770 | // } | ||
771 | |||
772 | // private ulong GetOGPCompatibleRegionHandle(ulong regionhandle) | ||
773 | // { | ||
774 | // uint x, y; | ||
775 | // Helpers.LongToUInts(regionhandle, out x, out y); | ||
776 | // return GetOGPCompatibleRegionHandle(x, y); | ||
777 | // } | ||
778 | |||
779 | private OGPState InitializeNewState() | 750 | private OGPState InitializeNewState() |
780 | { | 751 | { |
781 | OGPState returnState = new OGPState(); | 752 | OGPState returnState = new OGPState(); |