aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authordahlia2013-07-08 19:18:01 -0700
committerdahlia2013-07-08 19:18:01 -0700
commit065f8f56a248724c34d115f77a4d5b1a422f26f4 (patch)
tree324685b56dd983afaa9c52ac21b94d268fc3a238 /OpenSim/Region
parentremove an invalid null UUID check which caused a warning (diff)
downloadopensim-SC_OLD-065f8f56a248724c34d115f77a4d5b1a422f26f4.zip
opensim-SC_OLD-065f8f56a248724c34d115f77a4d5b1a422f26f4.tar.gz
opensim-SC_OLD-065f8f56a248724c34d115f77a4d5b1a422f26f4.tar.bz2
opensim-SC_OLD-065f8f56a248724c34d115f77a4d5b1a422f26f4.tar.xz
remove some cruft and trigger a rebuild
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index b997d4d..0a0d65c 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -397,7 +397,6 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
397 m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + matLocalID.ToString()); 397 m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + matLocalID.ToString());
398 else 398 else
399 { 399 {
400 //var te = sop.Shape.Textures;
401 var te = new Primitive.TextureEntry(sop.Shape.TextureEntry, 0, sop.Shape.TextureEntry.Length); 400 var te = new Primitive.TextureEntry(sop.Shape.TextureEntry, 0, sop.Shape.TextureEntry.Length);
402 401
403 if (te == null) 402 if (te == null)