diff options
author | Diva Canto | 2010-09-02 16:36:43 -0700 |
---|---|---|
committer | Diva Canto | 2010-09-02 16:36:43 -0700 |
commit | 21c5377af998bdd2c6a442588195a7af4d21fa48 (patch) | |
tree | 149e6d3dbeb5b3061bd5625763dfb388a50ed47b /OpenSim/Framework/LandData.cs | |
parent | Quick fix for making global references for gatekeepers that are not domain:po... (diff) | |
parent | Remove commented code and the comment, as the change has proven out (diff) | |
download | opensim-SC_OLD-21c5377af998bdd2c6a442588195a7af4d21fa48.zip opensim-SC_OLD-21c5377af998bdd2c6a442588195a7af4d21fa48.tar.gz opensim-SC_OLD-21c5377af998bdd2c6a442588195a7af4d21fa48.tar.bz2 opensim-SC_OLD-21c5377af998bdd2c6a442588195a7af4d21fa48.tar.xz |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/LandData.cs | 104 |
1 files changed, 90 insertions, 14 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 060e886..f263e67 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -90,6 +90,78 @@ namespace OpenSim.Framework | |||
90 | private Vector3 _userLookAt = new Vector3(); | 90 | private Vector3 _userLookAt = new Vector3(); |
91 | private int _dwell = 0; | 91 | private int _dwell = 0; |
92 | private int _otherCleanTime = 0; | 92 | private int _otherCleanTime = 0; |
93 | private string _mediaType = "none/none"; | ||
94 | private string _mediaDescription = ""; | ||
95 | private int _mediaHeight = 0; | ||
96 | private int _mediaWidth = 0; | ||
97 | private bool _mediaLoop = false; | ||
98 | private bool _obscureMusic = false; | ||
99 | private bool _obscureMedia = false; | ||
100 | |||
101 | /// <summary> | ||
102 | /// Whether to obscure parcel media URL | ||
103 | /// </summary> | ||
104 | [XmlIgnore] | ||
105 | public bool ObscureMedia { | ||
106 | get { | ||
107 | return _obscureMedia; | ||
108 | } | ||
109 | set { | ||
110 | _obscureMedia = value; | ||
111 | } | ||
112 | } | ||
113 | |||
114 | /// <summary> | ||
115 | /// Whether to obscure parcel music URL | ||
116 | /// </summary> | ||
117 | [XmlIgnore] | ||
118 | public bool ObscureMusic { | ||
119 | get { | ||
120 | return _obscureMusic; | ||
121 | } | ||
122 | set { | ||
123 | _obscureMusic = value; | ||
124 | } | ||
125 | } | ||
126 | |||
127 | /// <summary> | ||
128 | /// Whether to loop parcel media | ||
129 | /// </summary> | ||
130 | [XmlIgnore] | ||
131 | public bool MediaLoop { | ||
132 | get { | ||
133 | return _mediaLoop; | ||
134 | } | ||
135 | set { | ||
136 | _mediaLoop = value; | ||
137 | } | ||
138 | } | ||
139 | |||
140 | /// <summary> | ||
141 | /// Height of parcel media render | ||
142 | /// </summary> | ||
143 | [XmlIgnore] | ||
144 | public int MediaHeight { | ||
145 | get { | ||
146 | return _mediaHeight; | ||
147 | } | ||
148 | set { | ||
149 | _mediaHeight = value; | ||
150 | } | ||
151 | } | ||
152 | |||
153 | /// <summary> | ||
154 | /// Width of parcel media render | ||
155 | /// </summary> | ||
156 | [XmlIgnore] | ||
157 | public int MediaWidth { | ||
158 | get { | ||
159 | return _mediaWidth; | ||
160 | } | ||
161 | set { | ||
162 | _mediaWidth = value; | ||
163 | } | ||
164 | } | ||
93 | 165 | ||
94 | /// <summary> | 166 | /// <summary> |
95 | /// Upper corner of the AABB for the parcel | 167 | /// Upper corner of the AABB for the parcel |
@@ -358,20 +430,6 @@ namespace OpenSim.Framework | |||
358 | } | 430 | } |
359 | } | 431 | } |
360 | 432 | ||
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 | 433 | public string MediaType |
376 | { | 434 | { |
377 | get | 435 | get |
@@ -586,6 +644,17 @@ namespace OpenSim.Framework | |||
586 | } | 644 | } |
587 | } | 645 | } |
588 | 646 | ||
647 | /// <summary> | ||
648 | /// parcel media description | ||
649 | /// </summary> | ||
650 | public string MediaDescription { | ||
651 | get { | ||
652 | return _mediaDescription; | ||
653 | } | ||
654 | set { | ||
655 | _mediaDescription = value; | ||
656 | } | ||
657 | } | ||
589 | 658 | ||
590 | public LandData() | 659 | public LandData() |
591 | { | 660 | { |
@@ -635,6 +704,13 @@ namespace OpenSim.Framework | |||
635 | landData._userLookAt = _userLookAt; | 704 | landData._userLookAt = _userLookAt; |
636 | landData._otherCleanTime = _otherCleanTime; | 705 | landData._otherCleanTime = _otherCleanTime; |
637 | landData._dwell = _dwell; | 706 | landData._dwell = _dwell; |
707 | landData._mediaType = _mediaType; | ||
708 | landData._mediaDescription = _mediaDescription; | ||
709 | landData._mediaWidth = _mediaWidth; | ||
710 | landData._mediaHeight = _mediaHeight; | ||
711 | landData._mediaLoop = _mediaLoop; | ||
712 | landData._obscureMusic = _obscureMusic; | ||
713 | landData._obscureMedia = _obscureMedia; | ||
638 | 714 | ||
639 | landData._parcelAccessList.Clear(); | 715 | landData._parcelAccessList.Clear(); |
640 | foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList) | 716 | foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList) |