diff options
| author | Melanie | 2012-01-12 17:52:29 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-12 17:52:29 +0000 |
| commit | 4492bc1bcd055ab5b6f187612462b14b6494fea9 (patch) | |
| tree | 168e808c3931efc0e05f05ae60aafda6f0a4e946 /OpenSim/Region/OptionalModules | |
| parent | Remove ViewObjectInventory method unsupported by core (diff) | |
| parent | Allow update of stored entries within User Management Module-this is needed f... (diff) | |
| download | opensim-SC-4492bc1bcd055ab5b6f187612462b14b6494fea9.zip opensim-SC-4492bc1bcd055ab5b6f187612462b14b6494fea9.tar.gz opensim-SC-4492bc1bcd055ab5b6f187612462b14b6494fea9.tar.bz2 opensim-SC-4492bc1bcd055ab5b6f187612462b14b6494fea9.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index 58b9b9f..db70e56 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |||
| @@ -289,7 +289,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
| 289 | if (images.Length > 0) | 289 | if (images.Length > 0) |
| 290 | { | 290 | { |
| 291 | report.AppendFormat( | 291 | report.AppendFormat( |
| 292 | "{0,-36} {1,-8} {2,-9} {3,-9} {4,-9} {5,-7}\n", | 292 | "{0,-36} {1,-8} {2,-10} {3,-9} {4,-9} {5,-7}\n", |
| 293 | "Texture ID", | 293 | "Texture ID", |
| 294 | "Last Seq", | 294 | "Last Seq", |
| 295 | "Priority", | 295 | "Priority", |
| @@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
| 299 | 299 | ||
| 300 | foreach (J2KImage image in images) | 300 | foreach (J2KImage image in images) |
| 301 | report.AppendFormat( | 301 | report.AppendFormat( |
| 302 | "{0,36} {1,8} {2,9} {3,10} {4,9} {5,7}\n", | 302 | "{0,36} {1,8} {2,10} {3,10} {4,9} {5,7}\n", |
| 303 | image.TextureID, image.LastSequence, image.Priority, image.StartPacket, image.HasAsset, image.IsDecoded); | 303 | image.TextureID, image.LastSequence, image.Priority, image.StartPacket, image.HasAsset, image.IsDecoded); |
| 304 | } | 304 | } |
| 305 | } | 305 | } |