diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Data/NHibernate/Terrain.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/NHibernate/Terrain.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/NHibernate/Terrain.cs b/OpenSim/Data/NHibernate/Terrain.cs index 608f03e..dd0da44 100644 --- a/OpenSim/Data/NHibernate/Terrain.cs +++ b/OpenSim/Data/NHibernate/Terrain.cs | |||
@@ -30,7 +30,7 @@ using System.IO; | |||
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using log4net; | 32 | using log4net; |
33 | using libsecondlife; | 33 | using OpenMetaverse; |
34 | 34 | ||
35 | namespace OpenSim.Data.NHibernate | 35 | namespace OpenSim.Data.NHibernate |
36 | { | 36 | { |
@@ -39,9 +39,9 @@ namespace OpenSim.Data.NHibernate | |||
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
40 | 40 | ||
41 | private double[,] map; | 41 | private double[,] map; |
42 | private LLUUID regionID; | 42 | private UUID regionID; |
43 | 43 | ||
44 | public Terrain(LLUUID Region, double[,] array) | 44 | public Terrain(UUID Region, double[,] array) |
45 | { | 45 | { |
46 | map = array; | 46 | map = array; |
47 | regionID = Region; | 47 | regionID = Region; |
@@ -51,10 +51,10 @@ namespace OpenSim.Data.NHibernate | |||
51 | { | 51 | { |
52 | map = new double[Constants.RegionSize, Constants.RegionSize]; | 52 | map = new double[Constants.RegionSize, Constants.RegionSize]; |
53 | map.Initialize(); | 53 | map.Initialize(); |
54 | regionID = LLUUID.Zero; | 54 | regionID = UUID.Zero; |
55 | } | 55 | } |
56 | 56 | ||
57 | public LLUUID RegionID | 57 | public UUID RegionID |
58 | { | 58 | { |
59 | get { return regionID; } | 59 | get { return regionID; } |
60 | set { regionID = value; } | 60 | set { regionID = value; } |