diff options
author | Melanie | 2010-03-06 12:24:09 +0000 |
---|---|---|
committer | Melanie | 2010-03-06 12:24:09 +0000 |
commit | 1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90 (patch) | |
tree | 69419084feb98d59888b59a643e5fa062314605d /OpenSim/Framework/LandData.cs | |
parent | Remove a superfluous array creation (diff) | |
parent | - implementing server 1.38 functions (diff) | |
download | opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.zip opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.gz opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.bz2 opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.xz |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'OpenSim/Framework/LandData.cs')
-rw-r--r-- | OpenSim/Framework/LandData.cs | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 071a667..060e886 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -358,6 +358,32 @@ namespace OpenSim.Framework | |||
358 | } | 358 | } |
359 | } | 359 | } |
360 | 360 | ||
361 | private int[] _mediaSize = new int[2]; | ||
362 | public int[] MediaSize | ||
363 | { | ||
364 | get | ||
365 | { | ||
366 | return _mediaSize; | ||
367 | } | ||
368 | set | ||
369 | { | ||
370 | _mediaSize = value; | ||
371 | } | ||
372 | } | ||
373 | |||
374 | private string _mediaType = ""; | ||
375 | public string MediaType | ||
376 | { | ||
377 | get | ||
378 | { | ||
379 | return _mediaType; | ||
380 | } | ||
381 | set | ||
382 | { | ||
383 | _mediaType = value; | ||
384 | } | ||
385 | } | ||
386 | |||
361 | /// <summary> | 387 | /// <summary> |
362 | /// URL to the shoutcast music stream to play on the parcel | 388 | /// URL to the shoutcast music stream to play on the parcel |
363 | /// </summary> | 389 | /// </summary> |