diff options
| author | dahlia | 2010-10-20 20:43:08 -0700 |
|---|---|---|
| committer | dahlia | 2010-10-20 20:43:08 -0700 |
| commit | f8a47801ee9421282eb3abc3e89a465fc71f6930 (patch) | |
| tree | 1309c1db63355ee56f719e0fabe81278f3ef47b4 /OpenSim/Region/Framework | |
| parent | fix combining of multiple physics submeshes (diff) | |
| parent | * remove some spurious debug info (diff) | |
| download | opensim-SC-f8a47801ee9421282eb3abc3e89a465fc71f6930.zip opensim-SC-f8a47801ee9421282eb3abc3e89a465fc71f6930.tar.gz opensim-SC-f8a47801ee9421282eb3abc3e89a465fc71f6930.tar.bz2 opensim-SC-f8a47801ee9421282eb3abc3e89a465fc71f6930.tar.xz | |
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 13d9964..c223b4b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2976,6 +2976,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2976 | 2976 | ||
| 2977 | public void CopyTo(AgentData cAgent) | 2977 | public void CopyTo(AgentData cAgent) |
| 2978 | { | 2978 | { |
| 2979 | cAgent.CallbackURI = m_callbackURI; | ||
| 2980 | |||
| 2979 | cAgent.AgentID = UUID; | 2981 | cAgent.AgentID = UUID; |
| 2980 | cAgent.RegionID = Scene.RegionInfo.RegionID; | 2982 | cAgent.RegionID = Scene.RegionInfo.RegionID; |
| 2981 | 2983 | ||