diff options
| author | Melanie | 2010-08-19 11:47:50 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-19 11:47:50 +0100 |
| commit | 77705145a01b99ad373d72f0d03a4b33fc233038 (patch) | |
| tree | eef44f3de6cd3dfc274997896aa134dacf1ef3d5 /OpenSim/Region/Framework | |
| parent | Revert "Adding Group managment to the offline system" (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-77705145a01b99ad373d72f0d03a4b33fc233038.zip opensim-SC_OLD-77705145a01b99ad373d72f0d03a4b33fc233038.tar.gz opensim-SC_OLD-77705145a01b99ad373d72f0d03a4b33fc233038.tar.bz2 opensim-SC_OLD-77705145a01b99ad373d72f0d03a4b33fc233038.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 18ea865..ab18c93 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -2218,7 +2218,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2218 | 2218 | ||
| 2219 | if (root == null) | 2219 | if (root == null) |
| 2220 | { | 2220 | { |
| 2221 | m_log.DebugFormat("[LINK]: Can't find linkset root prim {0{", parentPrimId); | 2221 | m_log.DebugFormat("[LINK]: Can't find linkset root prim {0}", parentPrimId); |
| 2222 | return; | 2222 | return; |
| 2223 | } | 2223 | } |
| 2224 | 2224 | ||