diff options
| author | Diva Canto | 2013-07-02 16:47:17 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-02 16:47:17 -0700 |
| commit | 06dba1fa62d2dbc9e011b24328e1eee8c5fc9189 (patch) | |
| tree | dd23d5828b6fa2b0a8454f327048b982ed65eea7 | |
| parent | Deleted debug messages. Fixed a null ref exception on the POST handler of Gri... (diff) | |
| parent | minor: Correct typo of "Descrition" to "Description" in "show object *" conso... (diff) | |
| download | opensim-SC_OLD-06dba1fa62d2dbc9e011b24328e1eee8c5fc9189.zip opensim-SC_OLD-06dba1fa62d2dbc9e011b24328e1eee8c5fc9189.tar.gz opensim-SC_OLD-06dba1fa62d2dbc9e011b24328e1eee8c5fc9189.tar.bz2 opensim-SC_OLD-06dba1fa62d2dbc9e011b24328e1eee8c5fc9189.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/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 e434b2e..0e79733 100644 --- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | |||
| @@ -546,7 +546,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
| 546 | { | 546 | { |
| 547 | ConsoleDisplayList cdl = new ConsoleDisplayList(); | 547 | ConsoleDisplayList cdl = new ConsoleDisplayList(); |
| 548 | cdl.AddRow("Name", so.Name); | 548 | cdl.AddRow("Name", so.Name); |
| 549 | cdl.AddRow("Descrition", so.Description); | 549 | cdl.AddRow("Description", so.Description); |
| 550 | cdl.AddRow("Local ID", so.LocalId); | 550 | cdl.AddRow("Local ID", so.LocalId); |
| 551 | cdl.AddRow("UUID", so.UUID); | 551 | cdl.AddRow("UUID", so.UUID); |
| 552 | cdl.AddRow("Location", string.Format("{0} @ {1}", so.AbsolutePosition, so.Scene.Name)); | 552 | cdl.AddRow("Location", string.Format("{0} @ {1}", so.AbsolutePosition, so.Scene.Name)); |