From 3018b2c5d7c9de0e8da6d158f0848c840b7864ab Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Fri, 6 Dec 2013 16:21:11 +0200
Subject: Materials module: a) Store materials as assets; b) Finalized it
(removed the "Demo" label; removed most of the logging); c) Enabled by
default
Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
---
bin/OpenSim.ini.example | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'bin')
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 28c16cf..28369a3 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -691,6 +691,12 @@
; enable_windlight = false
+[Materials]
+ ;# {enable_materials} {} {Enable Materials support?} {true false} true
+ ;; This enables the use of Materials.
+ ; enable_materials = true
+
+
[DataSnapshot]
;# {index_sims} {} {Enable data snapshotting (search)?} {true false} false
;; The following set of configs pertains to search.
--
cgit v1.1
From 4800303abdaff19471988097c89193ff6cc4b24e Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 20 Jan 2014 03:18:36 -0800
Subject: update OpenMetaverse.StructuredData to git master
(bf4e9f654ff99c85e20b53e56faac38e307dd8c2) which fixes JSON OSD serialization
to a standards compliant means of encoding floating point NaN and Infinity
---
bin/OpenMetaverse.StructuredData.XML | 234 +++++++++++++++++------------------
bin/OpenMetaverse.StructuredData.dll | Bin 106496 -> 106496 bytes
2 files changed, 117 insertions(+), 117 deletions(-)
(limited to 'bin')
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 @@
OpenMetaverse.StructuredData
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Uses reflection to create an SDMap from all of the SD
- serializable types in an object
-
- Class or struct containing serializable types
- An SDMap holding the serialized values from the
- container object
-
-
-
- Uses reflection to deserialize member variables in an object from
- an SDMap
-
- Reference to an object to fill with deserialized
- values
- Serialized values to put in the target
- object
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -345,5 +228,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Uses reflection to create an SDMap from all of the SD
+ serializable types in an object
+
+ Class or struct containing serializable types
+ An SDMap holding the serialized values from the
+ container object
+
+
+
+ Uses reflection to deserialize member variables in an object from
+ an SDMap
+
+ Reference to an object to fill with deserialized
+ values
+ Serialized values to put in the target
+ object
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index d980531..ed613e7 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
--
cgit v1.1
From 83626e60e69ac0534faffa40f9e79a5d3ae0d332 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Mon, 20 Jan 2014 18:59:43 -0800
Subject: Adds a configuration option to cannibalize bandwidth from the udp
texture throttle and move it to the task throttle. Since most viewers are
using http textures, the udp texture throttle is holding onto bw that could
be used for more responsive prims updates. See the documentation for
CannibalizeTextureRate in OpenSimDefaults.ini. Option is disabled by default.
---
bin/OpenSimDefaults.ini | 10 ++++++++++
1 file changed, 10 insertions(+)
(limited to 'bin')
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ae7b794..0da99ba 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -539,6 +539,16 @@
;
;TextureSendLimit = 20
+ ; CannibalizeTextureRate allows bandwidth to be moved from the
+ ; UDP texture throttle to the task throttle. Since most viewers
+ ; use HTTP textures, this provides a means of using what is largely
+ ; unused bandwidth in the total throttle. The value is the proportion
+ ; of the texture rate to move to the task queue. It must be between
+ ; 0.0 (none of the bandwidth is cannibalized) and 0.9 (90% of the
+ ; bandwidth is grabbed)
+ ;
+ ; CannibalizeTextureRate = 0.5
+
; Quash and remove any light properties from attachments not on the
; hands. This allows flashlights and lanterns to function, but kills
; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
--
cgit v1.1