aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces/ISimulationService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/Interfaces/ISimulationService.cs')
-rw-r--r--OpenSim/Services/Interfaces/ISimulationService.cs9
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index ee1e294..3573bea 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Services.Interfaces
86 /// <param name="agentHomeURI">The visitor's Home URI. Will be missing (null) in older OpenSims.</param> 86 /// <param name="agentHomeURI">The visitor's Home URI. Will be missing (null) in older OpenSims.</param>
87 /// <param name="viaTeleport">True: via teleport; False: via cross (walking)</param> 87 /// <param name="viaTeleport">True: via teleport; False: via cross (walking)</param>
88 /// <param name="position">Position in the region</param> 88 /// <param name="position">Position in the region</param>
89<<<<<<< HEAD 89
90 /// <param name="sversion"> 90 /// <param name="sversion">
91 /// Version that the requesting simulator is runing. If null then no version check is carried out. 91 /// Version that the requesting simulator is runing. If null then no version check is carried out.
92 /// </param> 92 /// </param>
@@ -94,13 +94,6 @@ namespace OpenSim.Services.Interfaces
94 /// <param name="reason">[out] Optional error message</param> 94 /// <param name="reason">[out] Optional error message</param>
95 /// <returns>True: ok; False: not allowed</returns> 95 /// <returns>True: ok; False: not allowed</returns>
96 bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, List<UUID> features, out string version, out string reason); 96 bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, List<UUID> features, out string version, out string reason);
97=======
98 /// <param name="sversion">version that the requesting simulator is runing</param>
99 /// <param name="version">version that the target simulator is running</param>
100 /// <param name="reason">[out] Optional error message</param>
101 /// <returns>True: ok; False: not allowed</returns>
102 bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, out string version, out string reason);
103>>>>>>> avn/ubitvar
104 97
105 /// <summary> 98 /// <summary>
106 /// Message from receiving region to departing region, telling it got contacted by the client. 99 /// Message from receiving region to departing region, telling it got contacted by the client.