diff options
| author | Melanie | 2012-04-18 20:07:32 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-18 20:07:32 +0100 |
| commit | 7a255efdb2550ff4076cb78702f7f80c6a9079e3 (patch) | |
| tree | fa85230cc8096ecf88eb2506b9443f96fc0a0e8d /OpenSim | |
| parent | Don't re-add the assembly resolver for each script if not creating the appdomain (diff) | |
| parent | On "show part" command, show link number. (diff) | |
| download | opensim-SC-7a255efdb2550ff4076cb78702f7f80c6a9079e3.zip opensim-SC-7a255efdb2550ff4076cb78702f7f80c6a9079e3.tar.gz opensim-SC-7a255efdb2550ff4076cb78702f7f80c6a9079e3.tar.bz2 opensim-SC-7a255efdb2550ff4076cb78702f7f80c6a9079e3.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs index f5a5c92..06fea58 100644 --- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | |||
| @@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
| 282 | sb.AppendFormat("Location: {0} @ {1}\n", sop.AbsolutePosition, sop.ParentGroup.Scene.RegionInfo.RegionName); | 282 | sb.AppendFormat("Location: {0} @ {1}\n", sop.AbsolutePosition, sop.ParentGroup.Scene.RegionInfo.RegionName); |
| 283 | sb.AppendFormat("Parent: {0}", | 283 | sb.AppendFormat("Parent: {0}", |
| 284 | sop.IsRoot ? "Is Root\n" : string.Format("{0} {1}\n", sop.ParentGroup.Name, sop.ParentGroup.UUID)); | 284 | sop.IsRoot ? "Is Root\n" : string.Format("{0} {1}\n", sop.ParentGroup.Name, sop.ParentGroup.UUID)); |
| 285 | sb.AppendFormat("Parts: {0}\n", !sop.IsRoot ? "1" : sop.ParentGroup.PrimCount.ToString());; | 285 | sb.AppendFormat("Link number: {0}\n", sop.LinkNum); |
| 286 | 286 | ||
| 287 | return sb; | 287 | return sb; |
| 288 | } | 288 | } |