diff options
| author | Melanie | 2012-01-30 16:38:11 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-30 16:38:11 +0000 |
| commit | 1b600e7803a317e722b172c2a3481fc4d24ddc6c (patch) | |
| tree | 227712e3dd9df46b82edaf3e325af4c0a1ca9763 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add ParcelImageID to RegionSettings so we can have that overlay. (diff) | |
| download | opensim-SC_OLD-1b600e7803a317e722b172c2a3481fc4d24ddc6c.zip opensim-SC_OLD-1b600e7803a317e722b172c2a3481fc4d24ddc6c.tar.gz opensim-SC_OLD-1b600e7803a317e722b172c2a3481fc4d24ddc6c.tar.bz2 opensim-SC_OLD-1b600e7803a317e722b172c2a3481fc4d24ddc6c.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/RegionSettings.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index 786638e..e668ad5 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs | |||
| @@ -373,6 +373,14 @@ namespace OpenSim.Framework | |||
| 373 | set { m_SunVector = value; } | 373 | set { m_SunVector = value; } |
| 374 | } | 374 | } |
| 375 | 375 | ||
| 376 | private UUID m_ParcelImageID; | ||
| 377 | |||
| 378 | public UUID ParcelImageID | ||
| 379 | { | ||
| 380 | get { return m_ParcelImageID; } | ||
| 381 | set { m_ParcelImageID = value; } | ||
| 382 | } | ||
| 383 | |||
| 376 | private UUID m_TerrainImageID; | 384 | private UUID m_TerrainImageID; |
| 377 | 385 | ||
| 378 | public UUID TerrainImageID | 386 | public UUID TerrainImageID |