diff options
| author | Melanie | 2012-09-27 17:29:44 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-27 17:29:44 +0100 |
| commit | 001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4 (patch) | |
| tree | 11170fddbd0f4c71c6f8288b5848442dfdc90d76 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Remove a core undo call that we don't need. (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.zip opensim-SC-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.gz opensim-SC-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.bz2 opensim-SC-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 44573eb..a31a9ea 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2146,10 +2146,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2146 | { | 2146 | { |
| 2147 | if (asset != null) | 2147 | if (asset != null) |
| 2148 | SculptTextureCallback(asset); | 2148 | SculptTextureCallback(asset); |
| 2149 | else | 2149 | // else |
| 2150 | m_log.WarnFormat( | 2150 | // m_log.WarnFormat( |
| 2151 | "[SCENE OBJECT PART]: Part {0} {1} requested mesh/sculpt data for asset id {2} from asset service but received no data", | 2151 | // "[SCENE OBJECT PART]: Part {0} {1} requested mesh/sculpt data for asset id {2} from asset service but received no data", |
| 2152 | Name, UUID, id); | 2152 | // Name, UUID, id); |
| 2153 | } | 2153 | } |
| 2154 | 2154 | ||
| 2155 | /// <summary> | 2155 | /// <summary> |