diff options
| author | Melanie | 2010-05-16 15:01:56 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-16 15:01:56 +0100 |
| commit | b94cace5471c6a4269a5c2cd0969e4a106cfbdc2 (patch) | |
| tree | a79d6123f0926ddf438cad2964d460ac6b58ccd5 /OpenSim/Framework/IScene.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | * Fixed configs in StandaloneHypergrid.ini, it still had the SQLite connectio... (diff) | |
| download | opensim-SC-b94cace5471c6a4269a5c2cd0969e4a106cfbdc2.zip opensim-SC-b94cace5471c6a4269a5c2cd0969e4a106cfbdc2.tar.gz opensim-SC-b94cace5471c6a4269a5c2cd0969e4a106cfbdc2.tar.bz2 opensim-SC-b94cace5471c6a4269a5c2cd0969e4a106cfbdc2.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/IScene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 19ab409..6798b7b 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
| @@ -102,5 +102,7 @@ namespace OpenSim.Framework | |||
| 102 | void AddCommand(object module, string command, string shorthelp, string longhelp, CommandDelegate callback); | 102 | void AddCommand(object module, string command, string shorthelp, string longhelp, CommandDelegate callback); |
| 103 | 103 | ||
| 104 | ISceneObject DeserializeObject(string representation); | 104 | ISceneObject DeserializeObject(string representation); |
| 105 | |||
| 106 | bool CheckClient(UUID agentID, System.Net.IPEndPoint ep); | ||
| 105 | } | 107 | } |
| 106 | } | 108 | } |