aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2018-04-01 02:19:53 +0100
committerUbitUmarov2018-04-01 02:19:53 +0100
commita8308e2a13120cb3ab06ae4bd5d2aa9c06a091b8 (patch)
tree686458225dbf22646c9e233686407f4513953f85
parent several changes to materials, add llSet*PrimtiveParams*() support for them. ... (diff)
downloadopensim-SC-a8308e2a13120cb3ab06ae4bd5d2aa9c06a091b8.zip
opensim-SC-a8308e2a13120cb3ab06ae4bd5d2aa9c06a091b8.tar.gz
opensim-SC-a8308e2a13120cb3ab06ae4bd5d2aa9c06a091b8.tar.bz2
opensim-SC-a8308e2a13120cb3ab06ae4bd5d2aa9c06a091b8.tar.xz
coment out a debug line
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs2
-rw-r--r--opensim/Region/Framework/Interfaces/IMaterialsModule.cs1
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index 62e1e5c..c661268 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -359,7 +359,7 @@ namespace OpenSim.Region.OptionalModules.Materials
359 359
360 byte[] data = matAsset.Data; 360 byte[] data = matAsset.Data;
361 361
362 string txt = System.Text.Encoding.ASCII.GetString(data); 362 // string txt = System.Text.Encoding.ASCII.GetString(data);
363 try 363 try
364 { 364 {
365 mat = (OSDMap)OSDParser.DeserializeLLSDXml(data); 365 mat = (OSDMap)OSDParser.DeserializeLLSDXml(data);
diff --git a/opensim/Region/Framework/Interfaces/IMaterialsModule.cs b/opensim/Region/Framework/Interfaces/IMaterialsModule.cs
index 3f25874..8378063 100644
--- a/opensim/Region/Framework/Interfaces/IMaterialsModule.cs
+++ b/opensim/Region/Framework/Interfaces/IMaterialsModule.cs
@@ -25,7 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using OpenSim.Region.Framework.Scenes; 28using OpenSim.Region.Framework.Scenes;
30using OpenMetaverse; 29using OpenMetaverse;
31 30