diff options
author | Melanie | 2009-10-08 10:32:15 +0100 |
---|---|---|
committer | Melanie | 2009-10-08 10:32:15 +0100 |
commit | f6b8bac0fab3dfc3d25775e51bb89ee10feebb53 (patch) | |
tree | de16f4c7c14fce6851a4cd9c80117d1cbdd4b38e /OpenSim/Services/GridService/GridService.cs | |
parent | Correct a build break caused by an optimization in trunk (diff) | |
parent | Remove ThreadTrackerTest. It's no longer relevant because the thread (diff) | |
download | opensim-SC-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.zip opensim-SC-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.gz opensim-SC-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.bz2 opensim-SC-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Services/GridService/GridService.cs')
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index a2e4771..86815e5 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -200,6 +200,7 @@ namespace OpenSim.Services.GridService | |||
200 | rdata.RegionName = rinfo.RegionName; | 200 | rdata.RegionName = rinfo.RegionName; |
201 | rdata.Data = rinfo.ToKeyValuePairs(); | 201 | rdata.Data = rinfo.ToKeyValuePairs(); |
202 | rdata.Data["regionHandle"] = Utils.UIntsToLong((uint)rdata.posX, (uint)rdata.posY); | 202 | rdata.Data["regionHandle"] = Utils.UIntsToLong((uint)rdata.posX, (uint)rdata.posY); |
203 | rdata.Data["owner_uuid"] = rinfo.EstateOwner.ToString(); | ||
203 | return rdata; | 204 | return rdata; |
204 | } | 205 | } |
205 | 206 | ||