aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/IClientAPI.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-03-23 03:41:48 +0000
committerUbitUmarov2012-03-23 03:41:48 +0000
commit4db05a98c2c1678b612e0a3d2f95c24e34ac5f13 (patch)
tree3929bd993c504a3de7697f449e36535aeeddf737 /OpenSim/Framework/IClientAPI.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.zip
opensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.gz
opensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.bz2
opensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r--OpenSim/Framework/IClientAPI.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 94acdba..004b1a6 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1226,10 +1226,9 @@ namespace OpenSim.Framework
1226 /// <param name="OrbitalPosition">The orbital position is given in radians, and must be "adjusted" for the linden client, see LLClientView</param> 1226 /// <param name="OrbitalPosition">The orbital position is given in radians, and must be "adjusted" for the linden client, see LLClientView</param>
1227 void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, 1227 void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear,
1228 float OrbitalPosition); 1228 float OrbitalPosition);
1229 1229
1230 void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks); 1230 void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks);
1231 void SendViewerTime(int phase); 1231 void SendViewerTime(int phase);
1232 UUID GetDefaultAnimation(string name);
1233 1232
1234 void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, string flAbout, 1233 void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, string flAbout,
1235 uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID); 1234 uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID);