diff options
| author | Charles Krinke | 2009-06-02 20:56:27 +0000 |
|---|---|---|
| committer | Charles Krinke | 2009-06-02 20:56:27 +0000 |
| commit | 93da1c2e94837ec9ea5e8e038e9b5450d1a9385b (patch) | |
| tree | 2cff14ee267673c944b5299adde521f1ea4b31f9 /OpenSim/Grid | |
| parent | * Pried apart the ODE tests. This fixes mantis #3212 (diff) | |
| download | opensim-SC_OLD-93da1c2e94837ec9ea5e8e038e9b5450d1a9385b.zip opensim-SC_OLD-93da1c2e94837ec9ea5e8e038e9b5450d1a9385b.tar.gz opensim-SC_OLD-93da1c2e94837ec9ea5e8e038e9b5450d1a9385b.tar.bz2 opensim-SC_OLD-93da1c2e94837ec9ea5e8e038e9b5450d1a9385b.tar.xz | |
Thank you kindly, jonc, for a patch that:
Grid mode only. Serialization and deserialization of
byte representing Access Level is failing unless byte
is ToString'd first on Grid Server.
Diffstat (limited to 'OpenSim/Grid')
| -rw-r--r-- | OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs index 98d6adb..854e66a 100644 --- a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs +++ b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs | |||
| @@ -739,7 +739,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
| 739 | simProfileBlock["y"] = aSim.regionLocY.ToString(); | 739 | simProfileBlock["y"] = aSim.regionLocY.ToString(); |
| 740 | //m_log.DebugFormat("[MAP]: Sending neighbour info for {0},{1}", aSim.regionLocX, aSim.regionLocY); | 740 | //m_log.DebugFormat("[MAP]: Sending neighbour info for {0},{1}", aSim.regionLocX, aSim.regionLocY); |
| 741 | simProfileBlock["name"] = aSim.regionName; | 741 | simProfileBlock["name"] = aSim.regionName; |
| 742 | simProfileBlock["access"] = aSim.AccessLevel; | 742 | simProfileBlock["access"] = aSim.AccessLevel.ToString(); |
| 743 | simProfileBlock["region-flags"] = 512; | 743 | simProfileBlock["region-flags"] = 512; |
| 744 | simProfileBlock["water-height"] = 0; | 744 | simProfileBlock["water-height"] = 0; |
| 745 | simProfileBlock["agents"] = 1; | 745 | simProfileBlock["agents"] = 1; |
| @@ -774,7 +774,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
| 774 | simProfileBlock["x"] = x; | 774 | simProfileBlock["x"] = x; |
| 775 | simProfileBlock["y"] = y; | 775 | simProfileBlock["y"] = y; |
| 776 | simProfileBlock["name"] = simProfile.regionName; | 776 | simProfileBlock["name"] = simProfile.regionName; |
| 777 | simProfileBlock["access"] = simProfile.AccessLevel; | 777 | simProfileBlock["access"] = simProfile.AccessLevel.ToString(); |
| 778 | simProfileBlock["region-flags"] = 0; | 778 | simProfileBlock["region-flags"] = 0; |
| 779 | simProfileBlock["water-height"] = 20; | 779 | simProfileBlock["water-height"] = 20; |
| 780 | simProfileBlock["agents"] = 1; | 780 | simProfileBlock["agents"] = 1; |