diff options
author | Melanie | 2010-01-13 03:08:34 +0000 |
---|---|---|
committer | Melanie | 2010-01-13 03:08:34 +0000 |
commit | e3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3 (patch) | |
tree | 08b7a8beb35f70cfd8f75400a339da37deed61f4 /OpenSim/Tests | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-e3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3.zip opensim-SC_OLD-e3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3.tar.gz opensim-SC_OLD-e3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3.tar.bz2 opensim-SC_OLD-e3a04fcb7b6510b46bc4e24b9a1bc6e321774ac3.tar.xz |
Change the error messages on region region registration. This changes URM
and region. The non-error case should be compatible, so no version bump.
Untested.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Clients/Grid/GridClient.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Tests/Clients/Grid/GridClient.cs b/OpenSim/Tests/Clients/Grid/GridClient.cs index 972c0aa..8e33373 100644 --- a/OpenSim/Tests/Clients/Grid/GridClient.cs +++ b/OpenSim/Tests/Clients/Grid/GridClient.cs | |||
@@ -63,27 +63,28 @@ namespace OpenSim.Tests.Clients.GridClient | |||
63 | GridRegion r3 = CreateRegion("Test Region 3", 1005, 1000); | 63 | GridRegion r3 = CreateRegion("Test Region 3", 1005, 1000); |
64 | 64 | ||
65 | Console.WriteLine("[GRID CLIENT]: *** Registering region 1"); | 65 | Console.WriteLine("[GRID CLIENT]: *** Registering region 1"); |
66 | bool success = m_Connector.RegisterRegion(UUID.Zero, r1); | 66 | string msg = m_Connector.RegisterRegion(UUID.Zero, r1); |
67 | if (success) | 67 | if (msg == String.Empty) |
68 | Console.WriteLine("[GRID CLIENT]: Successfully registered region 1"); | 68 | Console.WriteLine("[GRID CLIENT]: Successfully registered region 1"); |
69 | else | 69 | else |
70 | Console.WriteLine("[GRID CLIENT]: region 1 failed to register"); | 70 | Console.WriteLine("[GRID CLIENT]: region 1 failed to register"); |
71 | 71 | ||
72 | Console.WriteLine("[GRID CLIENT]: *** Registering region 2"); | 72 | Console.WriteLine("[GRID CLIENT]: *** Registering region 2"); |
73 | success = m_Connector.RegisterRegion(UUID.Zero, r2); | 73 | msg = m_Connector.RegisterRegion(UUID.Zero, r2); |
74 | if (success) | 74 | if (msg == String.Empty) |
75 | Console.WriteLine("[GRID CLIENT]: Successfully registered region 2"); | 75 | Console.WriteLine("[GRID CLIENT]: Successfully registered region 2"); |
76 | else | 76 | else |
77 | Console.WriteLine("[GRID CLIENT]: region 2 failed to register"); | 77 | Console.WriteLine("[GRID CLIENT]: region 2 failed to register"); |
78 | 78 | ||
79 | Console.WriteLine("[GRID CLIENT]: *** Registering region 3"); | 79 | Console.WriteLine("[GRID CLIENT]: *** Registering region 3"); |
80 | success = m_Connector.RegisterRegion(UUID.Zero, r3); | 80 | msg = m_Connector.RegisterRegion(UUID.Zero, r3); |
81 | if (success) | 81 | if (msg == String.Empty) |
82 | Console.WriteLine("[GRID CLIENT]: Successfully registered region 3"); | 82 | Console.WriteLine("[GRID CLIENT]: Successfully registered region 3"); |
83 | else | 83 | else |
84 | Console.WriteLine("[GRID CLIENT]: region 3 failed to register"); | 84 | Console.WriteLine("[GRID CLIENT]: region 3 failed to register"); |
85 | 85 | ||
86 | 86 | ||
87 | bool success; | ||
87 | Console.WriteLine("[GRID CLIENT]: *** Deregistering region 3"); | 88 | Console.WriteLine("[GRID CLIENT]: *** Deregistering region 3"); |
88 | success = m_Connector.DeregisterRegion(r3.RegionID); | 89 | success = m_Connector.DeregisterRegion(r3.RegionID); |
89 | if (success) | 90 | if (success) |
@@ -91,8 +92,8 @@ namespace OpenSim.Tests.Clients.GridClient | |||
91 | else | 92 | else |
92 | Console.WriteLine("[GRID CLIENT]: region 3 failed to deregister"); | 93 | Console.WriteLine("[GRID CLIENT]: region 3 failed to deregister"); |
93 | Console.WriteLine("[GRID CLIENT]: *** Registering region 3 again"); | 94 | Console.WriteLine("[GRID CLIENT]: *** Registering region 3 again"); |
94 | success = m_Connector.RegisterRegion(UUID.Zero, r3); | 95 | msg = m_Connector.RegisterRegion(UUID.Zero, r3); |
95 | if (success) | 96 | if (msg == String.Empty) |
96 | Console.WriteLine("[GRID CLIENT]: Successfully registered region 3"); | 97 | Console.WriteLine("[GRID CLIENT]: Successfully registered region 3"); |
97 | else | 98 | else |
98 | Console.WriteLine("[GRID CLIENT]: region 3 failed to register"); | 99 | Console.WriteLine("[GRID CLIENT]: region 3 failed to register"); |