diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs')
| -rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index c07c6a6..c542c29 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
| @@ -415,6 +415,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
| 415 | GetBoolResponse(request, out reason); | 415 | GetBoolResponse(request, out reason); |
| 416 | } | 416 | } |
| 417 | 417 | ||
| 418 | [Obsolete] | ||
| 418 | public List<UUID> StatusNotification(List<string> friends, UUID userID, bool online) | 419 | public List<UUID> StatusNotification(List<string> friends, UUID userID, bool online) |
| 419 | { | 420 | { |
| 420 | Hashtable hash = new Hashtable(); | 421 | Hashtable hash = new Hashtable(); |