diff options
| author | Justin Clark-Casey (justincc) | 2011-03-05 02:18:03 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-03-05 02:18:03 +0000 |
| commit | 9f85ee29ac9f5e0aa8c1976944f9af12da3514db (patch) | |
| tree | f691f174d2cbab49415112fcba5dd828fe18d501 /OpenSim/Framework | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-9f85ee29ac9f5e0aa8c1976944f9af12da3514db.zip opensim-SC_OLD-9f85ee29ac9f5e0aa8c1976944f9af12da3514db.tar.gz opensim-SC_OLD-9f85ee29ac9f5e0aa8c1976944f9af12da3514db.tar.bz2 opensim-SC_OLD-9f85ee29ac9f5e0aa8c1976944f9af12da3514db.tar.xz | |
Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to false
Implement test for ClearMediaEntry()
Diffstat (limited to '')
| -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 927415e..7b5fb2e 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 | ||