diff options
| author | Melanie | 2012-03-29 00:27:35 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-29 00:27:35 +0100 |
| commit | 7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f (patch) | |
| tree | b09be52d5e7838b7c187c92f08f6c2bc73741a42 /OpenSim/Framework/IClientAPI.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add comment about setting client.SceneAgent in AddNewClient() (diff) | |
| download | opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.zip opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.gz opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.bz2 opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 004b1a6..881f815 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -717,7 +717,7 @@ namespace OpenSim.Framework | |||
| 717 | /// The scene agent for this client. This will only be set if the client has an agent in a scene (i.e. if it | 717 | /// The scene agent for this client. This will only be set if the client has an agent in a scene (i.e. if it |
| 718 | /// is connected). | 718 | /// is connected). |
| 719 | /// </summary> | 719 | /// </summary> |
| 720 | ISceneAgent SceneAgent { get; } | 720 | ISceneAgent SceneAgent { get; set; } |
| 721 | 721 | ||
| 722 | UUID SessionId { get; } | 722 | UUID SessionId { get; } |
| 723 | 723 | ||