diff options
| author | Melanie | 2010-08-19 11:46:07 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-19 11:46:07 +0100 |
| commit | ee7c79969968ca3b6e302bd92edf6a6397a1468e (patch) | |
| tree | 89d36348c189285c14cc4f19f533c817259d556f /OpenSim/Region/Framework | |
| parent | Skip conversion if fields that are null in the database. This may (diff) | |
| parent | Improve some logging in LandConnector (diff) | |
| download | opensim-SC-ee7c79969968ca3b6e302bd92edf6a6397a1468e.zip opensim-SC-ee7c79969968ca3b6e302bd92edf6a6397a1468e.tar.gz opensim-SC-ee7c79969968ca3b6e302bd92edf6a6397a1468e.tar.bz2 opensim-SC-ee7c79969968ca3b6e302bd92edf6a6397a1468e.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 9963225..4d84018 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -2165,7 +2165,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2165 | 2165 | ||
| 2166 | if (root == null) | 2166 | if (root == null) |
| 2167 | { | 2167 | { |
| 2168 | m_log.DebugFormat("[LINK]: Can't find linkset root prim {0{", parentPrimId); | 2168 | m_log.DebugFormat("[LINK]: Can't find linkset root prim {0}", parentPrimId); |
| 2169 | return; | 2169 | return; |
| 2170 | } | 2170 | } |
| 2171 | 2171 | ||