diff options
author | Melanie | 2012-06-12 03:09:52 +0100 |
---|---|---|
committer | Melanie | 2012-06-12 03:09:52 +0100 |
commit | dfafb5ca1451a407eafa6fbdc0246d6bdb962531 (patch) | |
tree | 62a3ba18f0ea09be7ec0bcbc3afdc701f592c7e6 /OpenSim/Framework/ISceneAgent.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Remove accidental timeout left in during earlier debugging. Has been in sinc... (diff) | |
download | opensim-SC-dfafb5ca1451a407eafa6fbdc0246d6bdb962531.zip opensim-SC-dfafb5ca1451a407eafa6fbdc0246d6bdb962531.tar.gz opensim-SC-dfafb5ca1451a407eafa6fbdc0246d6bdb962531.tar.bz2 opensim-SC-dfafb5ca1451a407eafa6fbdc0246d6bdb962531.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/ISceneAgent.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/ISceneAgent.cs b/OpenSim/Framework/ISceneAgent.cs index 824172d..563d906 100644 --- a/OpenSim/Framework/ISceneAgent.cs +++ b/OpenSim/Framework/ISceneAgent.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenMetaverse; | ||
29 | 30 | ||
30 | namespace OpenSim.Framework | 31 | namespace OpenSim.Framework |
31 | { | 32 | { |
@@ -71,5 +72,11 @@ namespace OpenSim.Framework | |||
71 | /// This includes scene object data and the appearance data of other avatars. | 72 | /// This includes scene object data and the appearance data of other avatars. |
72 | /// </remarks> | 73 | /// </remarks> |
73 | void SendInitialDataToMe(); | 74 | void SendInitialDataToMe(); |
75 | |||
76 | /// <summary> | ||
77 | /// Direction in which the scene presence is looking. | ||
78 | /// </summary> | ||
79 | /// <remarks>Will be Vector3.Zero for a child agent.</remarks> | ||
80 | Vector3 Lookat { get; } | ||
74 | } | 81 | } |
75 | } \ No newline at end of file | 82 | } \ No newline at end of file |