aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorRobert Adams2014-01-21 11:31:51 -0800
committerRobert Adams2014-01-21 11:31:51 -0800
commit4c362a83f9ce0b168ea96ba7dbd7ec012445ecff (patch)
tree7f03a860379fb2c6905d78a6616db762c86dd634 /bin
parentvarregion: remove debugging splat file saving that fills up the (diff)
parentAdds a configuration option to cannibalize bandwidth from the (diff)
downloadopensim-SC_OLD-4c362a83f9ce0b168ea96ba7dbd7ec012445ecff.zip
opensim-SC_OLD-4c362a83f9ce0b168ea96ba7dbd7ec012445ecff.tar.gz
opensim-SC_OLD-4c362a83f9ce0b168ea96ba7dbd7ec012445ecff.tar.bz2
opensim-SC_OLD-4c362a83f9ce0b168ea96ba7dbd7ec012445ecff.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenMetaverse.StructuredData.XML234
-rwxr-xr-xbin/OpenMetaverse.StructuredData.dllbin106496 -> 106496 bytes
-rw-r--r--bin/OpenSim.ini.example6
-rw-r--r--bin/OpenSimDefaults.ini10
4 files changed, 133 insertions, 117 deletions
diff --git a/bin/OpenMetaverse.StructuredData.XML b/bin/OpenMetaverse.StructuredData.XML
index 789ad5b..3999d99 100644
--- a/bin/OpenMetaverse.StructuredData.XML
+++ b/bin/OpenMetaverse.StructuredData.XML
@@ -4,123 +4,6 @@
4 <name>OpenMetaverse.StructuredData</name> 4 <name>OpenMetaverse.StructuredData</name>
5 </assembly> 5 </assembly>
6 <members> 6 <members>
7 <member name="T:OpenMetaverse.StructuredData.OSDType">
8 <summary>
9
10 </summary>
11 </member>
12 <member name="F:OpenMetaverse.StructuredData.OSDType.Unknown">
13 <summary></summary>
14 </member>
15 <member name="F:OpenMetaverse.StructuredData.OSDType.Boolean">
16 <summary></summary>
17 </member>
18 <member name="F:OpenMetaverse.StructuredData.OSDType.Integer">
19 <summary></summary>
20 </member>
21 <member name="F:OpenMetaverse.StructuredData.OSDType.Real">
22 <summary></summary>
23 </member>
24 <member name="F:OpenMetaverse.StructuredData.OSDType.String">
25 <summary></summary>
26 </member>
27 <member name="F:OpenMetaverse.StructuredData.OSDType.UUID">
28 <summary></summary>
29 </member>
30 <member name="F:OpenMetaverse.StructuredData.OSDType.Date">
31 <summary></summary>
32 </member>
33 <member name="F:OpenMetaverse.StructuredData.OSDType.URI">
34 <summary></summary>
35 </member>
36 <member name="F:OpenMetaverse.StructuredData.OSDType.Binary">
37 <summary></summary>
38 </member>
39 <member name="F:OpenMetaverse.StructuredData.OSDType.Map">
40 <summary></summary>
41 </member>
42 <member name="F:OpenMetaverse.StructuredData.OSDType.Array">
43 <summary></summary>
44 </member>
45 <member name="T:OpenMetaverse.StructuredData.OSDException">
46 <summary>
47
48 </summary>
49 </member>
50 <member name="T:OpenMetaverse.StructuredData.OSD">
51 <summary>
52
53 </summary>
54 </member>
55 <member name="M:OpenMetaverse.StructuredData.OSD.SerializeMembers(System.Object)">
56 <summary>
57 Uses reflection to create an SDMap from all of the SD
58 serializable types in an object
59 </summary>
60 <param name="obj">Class or struct containing serializable types</param>
61 <returns>An SDMap holding the serialized values from the
62 container object</returns>
63 </member>
64 <member name="M:OpenMetaverse.StructuredData.OSD.DeserializeMembers(System.Object@,OpenMetaverse.StructuredData.OSDMap)">
65 <summary>
66 Uses reflection to deserialize member variables in an object from
67 an SDMap
68 </summary>
69 <param name="obj">Reference to an object to fill with deserialized
70 values</param>
71 <param name="serialized">Serialized values to put in the target
72 object</param>
73 </member>
74 <member name="T:OpenMetaverse.StructuredData.OSDBoolean">
75 <summary>
76
77 </summary>
78 </member>
79 <member name="T:OpenMetaverse.StructuredData.OSDInteger">
80 <summary>
81
82 </summary>
83 </member>
84 <member name="T:OpenMetaverse.StructuredData.OSDReal">
85 <summary>
86
87 </summary>
88 </member>
89 <member name="T:OpenMetaverse.StructuredData.OSDString">
90 <summary>
91
92 </summary>
93 </member>
94 <member name="T:OpenMetaverse.StructuredData.OSDUUID">
95 <summary>
96
97 </summary>
98 </member>
99 <member name="T:OpenMetaverse.StructuredData.OSDDate">
100 <summary>
101
102 </summary>
103 </member>
104 <member name="T:OpenMetaverse.StructuredData.OSDUri">
105 <summary>
106
107 </summary>
108 </member>
109 <member name="T:OpenMetaverse.StructuredData.OSDBinary">
110 <summary>
111
112 </summary>
113 </member>
114 <member name="T:OpenMetaverse.StructuredData.OSDMap">
115 <summary>
116
117 </summary>
118 </member>
119 <member name="T:OpenMetaverse.StructuredData.OSDArray">
120 <summary>
121
122 </summary>
123 </member>
124 <member name="T:OpenMetaverse.StructuredData.OSDParser"> 7 <member name="T:OpenMetaverse.StructuredData.OSDParser">
125 <summary> 8 <summary>
126 9
@@ -345,5 +228,122 @@
345 <param name="c"></param> 228 <param name="c"></param>
346 <returns></returns> 229 <returns></returns>
347 </member> 230 </member>
231 <member name="T:OpenMetaverse.StructuredData.OSDType">
232 <summary>
233
234 </summary>
235 </member>
236 <member name="F:OpenMetaverse.StructuredData.OSDType.Unknown">
237 <summary></summary>
238 </member>
239 <member name="F:OpenMetaverse.StructuredData.OSDType.Boolean">
240 <summary></summary>
241 </member>
242 <member name="F:OpenMetaverse.StructuredData.OSDType.Integer">
243 <summary></summary>
244 </member>
245 <member name="F:OpenMetaverse.StructuredData.OSDType.Real">
246 <summary></summary>
247 </member>
248 <member name="F:OpenMetaverse.StructuredData.OSDType.String">
249 <summary></summary>
250 </member>
251 <member name="F:OpenMetaverse.StructuredData.OSDType.UUID">
252 <summary></summary>
253 </member>
254 <member name="F:OpenMetaverse.StructuredData.OSDType.Date">
255 <summary></summary>
256 </member>
257 <member name="F:OpenMetaverse.StructuredData.OSDType.URI">
258 <summary></summary>
259 </member>
260 <member name="F:OpenMetaverse.StructuredData.OSDType.Binary">
261 <summary></summary>
262 </member>
263 <member name="F:OpenMetaverse.StructuredData.OSDType.Map">
264 <summary></summary>
265 </member>
266 <member name="F:OpenMetaverse.StructuredData.OSDType.Array">
267 <summary></summary>
268 </member>
269 <member name="T:OpenMetaverse.StructuredData.OSDException">
270 <summary>
271
272 </summary>
273 </member>
274 <member name="T:OpenMetaverse.StructuredData.OSD">
275 <summary>
276
277 </summary>
278 </member>
279 <member name="M:OpenMetaverse.StructuredData.OSD.SerializeMembers(System.Object)">
280 <summary>
281 Uses reflection to create an SDMap from all of the SD
282 serializable types in an object
283 </summary>
284 <param name="obj">Class or struct containing serializable types</param>
285 <returns>An SDMap holding the serialized values from the
286 container object</returns>
287 </member>
288 <member name="M:OpenMetaverse.StructuredData.OSD.DeserializeMembers(System.Object@,OpenMetaverse.StructuredData.OSDMap)">
289 <summary>
290 Uses reflection to deserialize member variables in an object from
291 an SDMap
292 </summary>
293 <param name="obj">Reference to an object to fill with deserialized
294 values</param>
295 <param name="serialized">Serialized values to put in the target
296 object</param>
297 </member>
298 <member name="T:OpenMetaverse.StructuredData.OSDBoolean">
299 <summary>
300
301 </summary>
302 </member>
303 <member name="T:OpenMetaverse.StructuredData.OSDInteger">
304 <summary>
305
306 </summary>
307 </member>
308 <member name="T:OpenMetaverse.StructuredData.OSDReal">
309 <summary>
310
311 </summary>
312 </member>
313 <member name="T:OpenMetaverse.StructuredData.OSDString">
314 <summary>
315
316 </summary>
317 </member>
318 <member name="T:OpenMetaverse.StructuredData.OSDUUID">
319 <summary>
320
321 </summary>
322 </member>
323 <member name="T:OpenMetaverse.StructuredData.OSDDate">
324 <summary>
325
326 </summary>
327 </member>
328 <member name="T:OpenMetaverse.StructuredData.OSDUri">
329 <summary>
330
331 </summary>
332 </member>
333 <member name="T:OpenMetaverse.StructuredData.OSDBinary">
334 <summary>
335
336 </summary>
337 </member>
338 <member name="T:OpenMetaverse.StructuredData.OSDMap">
339 <summary>
340
341 </summary>
342 </member>
343 <member name="T:OpenMetaverse.StructuredData.OSDArray">
344 <summary>
345
346 </summary>
347 </member>
348 </members> 348 </members>
349</doc> 349</doc>
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index d980531..ed613e7 100755
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
Binary files differ
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d422c33..b692758 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -703,6 +703,12 @@
703 ; enable_windlight = false 703 ; enable_windlight = false
704 704
705 705
706[Materials]
707 ;# {enable_materials} {} {Enable Materials support?} {true false} true
708 ;; This enables the use of Materials.
709 ; enable_materials = true
710
711
706[DataSnapshot] 712[DataSnapshot]
707 ;# {index_sims} {} {Enable data snapshotting (search)?} {true false} false 713 ;# {index_sims} {} {Enable data snapshotting (search)?} {true false} false
708 ;; The following set of configs pertains to search. 714 ;; The following set of configs pertains to search.
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index d80f5ba..df94239 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -548,6 +548,16 @@
548 ; 548 ;
549 ;TextureSendLimit = 20 549 ;TextureSendLimit = 20
550 550
551 ; CannibalizeTextureRate allows bandwidth to be moved from the
552 ; UDP texture throttle to the task throttle. Since most viewers
553 ; use HTTP textures, this provides a means of using what is largely
554 ; unused bandwidth in the total throttle. The value is the proportion
555 ; of the texture rate to move to the task queue. It must be between
556 ; 0.0 (none of the bandwidth is cannibalized) and 0.9 (90% of the
557 ; bandwidth is grabbed)
558 ;
559 ; CannibalizeTextureRate = 0.5
560
551 ; Quash and remove any light properties from attachments not on the 561 ; Quash and remove any light properties from attachments not on the
552 ; hands. This allows flashlights and lanterns to function, but kills 562 ; hands. This allows flashlights and lanterns to function, but kills
553 ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps 563 ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
generated by cgit v1.1 at 2024-12-23 08:58:33 +0000