aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorSean Dague2008-07-17 19:58:45 +0000
committerSean Dague2008-07-17 19:58:45 +0000
commit8f2154916b95a137c835b2d40381802ccb8ead41 (patch)
tree680ab828ce75381792db3d700f3c51caccc8a3df /OpenSim/Data
parentadd plywood texture as a constant, as we need it in a couple of places (diff)
downloadopensim-SC-8f2154916b95a137c835b2d40381802ccb8ead41.zip
opensim-SC-8f2154916b95a137c835b2d40381802ccb8ead41.tar.gz
opensim-SC-8f2154916b95a137c835b2d40381802ccb8ead41.tar.bz2
opensim-SC-8f2154916b95a137c835b2d40381802ccb8ead41.tar.xz
if no texture, make it plywood
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/NHibernate/TextureUserType.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Data/NHibernate/TextureUserType.cs b/OpenSim/Data/NHibernate/TextureUserType.cs
index b688a16..f8aa704 100644
--- a/OpenSim/Data/NHibernate/TextureUserType.cs
+++ b/OpenSim/Data/NHibernate/TextureUserType.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Data; 29using System.Data;
30using libsecondlife; 30using libsecondlife;
31using OpenSim.Framework;
31using NHibernate; 32using NHibernate;
32using NHibernate.SqlTypes; 33using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 34using NHibernate.UserTypes;
@@ -52,7 +53,7 @@ namespace OpenSim.Data.NHibernate
52 if (texture == null) 53 if (texture == null)
53 { 54 {
54 // TODO: should parametrize this texture out 55 // TODO: should parametrize this texture out
55 return new LLObject.TextureEntry(new LLUUID("89556747-24cb-43ed-920b-47caed15465f")); 56 return new LLObject.TextureEntry(new LLUUID(Constants.DefaultTexture));
56 } 57 }
57 else 58 else
58 { 59 {