diff options
| author | Robert Adams | 2014-01-19 07:38:53 -0800 |
|---|---|---|
| committer | Robert Adams | 2014-01-19 07:38:53 -0800 |
| commit | f127e4b4ee916a429ef1d9922432869d4138e214 (patch) | |
| tree | be90e6cea8d61088e8380e7027881a8d13f67849 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | varregion: Update Warp3D to properly handle varregions. (diff) | |
| parent | Fix casting error for float type INI file parameter parsing. (diff) | |
| download | opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.zip opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.tar.gz opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.tar.bz2 opensim-SC_OLD-f127e4b4ee916a429ef1d9922432869d4138e214.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d8a4ed1..aee621f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -4389,18 +4389,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4389 | return sp; | 4389 | return sp; |
| 4390 | } | 4390 | } |
| 4391 | 4391 | ||
| 4392 | public virtual bool IncomingRetrieveRootAgent(UUID id, out IAgentData agent) | ||
| 4393 | { | ||
| 4394 | agent = null; | ||
| 4395 | ScenePresence sp = GetScenePresence(id); | ||
| 4396 | if ((sp != null) && (!sp.IsChildAgent)) | ||
| 4397 | { | ||
| 4398 | sp.IsChildAgent = true; | ||
| 4399 | return sp.CopyAgent(out agent); | ||
| 4400 | } | ||
| 4401 | |||
| 4402 | return false; | ||
| 4403 | } | ||
| 4404 | /// <summary> | 4392 | /// <summary> |
| 4405 | /// Authenticated close (via network) | 4393 | /// Authenticated close (via network) |
| 4406 | /// </summary> | 4394 | /// </summary> |