diff options
| author | Kitto Flora | 2011-03-22 20:33:24 +0000 |
|---|---|---|
| committer | Kitto Flora | 2011-03-22 20:33:24 +0000 |
| commit | 764e8c2a4371c24d1a0bd067c0bcbc806562064d (patch) | |
| tree | 03dfb1bfe16c420fdbb6a1aa723c9203771d1beb /OpenSim/Framework/PrimitiveBaseShape.cs | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Add some more fields to Estate settings and make them work. (diff) | |
| download | opensim-SC-764e8c2a4371c24d1a0bd067c0bcbc806562064d.zip opensim-SC-764e8c2a4371c24d1a0bd067c0bcbc806562064d.tar.gz opensim-SC-764e8c2a4371c24d1a0bd067c0bcbc806562064d.tar.bz2 opensim-SC-764e8c2a4371c24d1a0bd067c0bcbc806562064d.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/PrimitiveBaseShape.cs')
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 9a38f23..44f484e 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
| @@ -250,7 +250,7 @@ namespace OpenSim.Framework | |||
| 250 | { | 250 | { |
| 251 | get | 251 | get |
| 252 | { | 252 | { |
| 253 | //m_log.DebugFormat("[SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length); | 253 | // m_log.DebugFormat("[SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length); |
| 254 | try { return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); } | 254 | try { return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); } |
| 255 | catch { } | 255 | catch { } |
| 256 | 256 | ||