diff options
| author | Melanie | 2010-01-04 21:41:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 21:41:33 +0000 |
| commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
| tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/CoreModules/Framework | |
| parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
| parent | Finish conversion if XInventoryService (diff) | |
| download | opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs index 67fc8e6..efa60bb 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs | |||
| @@ -484,11 +484,11 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
| 484 | QueryDataMap.Add("GlobalZ", OSD.FromInteger((int)groupDataBlock.GlobalZ)); | 484 | QueryDataMap.Add("GlobalZ", OSD.FromInteger((int)groupDataBlock.GlobalZ)); |
| 485 | QueryDataMap.Add("Name", OSD.FromBinary(groupDataBlock.Name)); | 485 | QueryDataMap.Add("Name", OSD.FromBinary(groupDataBlock.Name)); |
| 486 | QueryDataMap.Add("OwnerID", OSD.FromUUID(groupDataBlock.OwnerID)); | 486 | QueryDataMap.Add("OwnerID", OSD.FromUUID(groupDataBlock.OwnerID)); |
| 487 | QueryDataMap.Add("SimName", OSD.FromBinary(groupDataBlock.SimName)); | 487 | QueryDataMap.Add("SimName", OSD.FromBinary(groupDataBlock.SimName)); |
| 488 | QueryDataMap.Add("SnapShotID", OSD.FromUUID(groupDataBlock.SnapshotID)); | 488 | QueryDataMap.Add("SnapShotID", OSD.FromUUID(groupDataBlock.SnapshotID)); |
| 489 | QueryDataMap.Add("ProductSku", OSD.FromInteger(0)); | 489 | QueryDataMap.Add("ProductSku", OSD.FromInteger(0)); |
| 490 | QueryDataMap.Add("Price", OSD.FromInteger(groupDataBlock.Price)); | 490 | QueryDataMap.Add("Price", OSD.FromInteger(groupDataBlock.Price)); |
| 491 | 491 | ||
| 492 | QueryData.Add(QueryDataMap); | 492 | QueryData.Add(QueryDataMap); |
| 493 | } | 493 | } |
| 494 | body.Add("QueryData", QueryData); | 494 | body.Add("QueryData", QueryData); |