diff options
author | Revolution | 2010-02-14 15:41:57 -0600 |
---|---|---|
committer | Melanie | 2010-02-14 22:18:46 +0000 |
commit | 9821c4f566e11c75c8d87721777480c5b2e2bd4e (patch) | |
tree | 04cf7edb4cfe07e1f50ce3ee0ca5d846e6a7a379 /OpenSim/Framework | |
parent | * SQLite match code casing with regionsettings table field casing (what's wit... (diff) | |
download | opensim-SC_OLD-9821c4f566e11c75c8d87721777480c5b2e2bd4e.zip opensim-SC_OLD-9821c4f566e11c75c8d87721777480c5b2e2bd4e.tar.gz opensim-SC_OLD-9821c4f566e11c75c8d87721777480c5b2e2bd4e.tar.bz2 opensim-SC_OLD-9821c4f566e11c75c8d87721777480c5b2e2bd4e.tar.xz |
Revolution is on the roll again! :)
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).
Direct flames and kudos to Revolution, please
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 7 | ||||
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/LandData.cs | 26 |
3 files changed, 36 insertions, 5 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index a3ea499..b2c4d8e 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -390,11 +390,12 @@ namespace OpenSim.Framework | |||
390 | + 0.08f * (float)m_visualparams[(int)VPElement.SHOES_PLATFORM_HEIGHT] / 255.0f // Shoe platform height | 390 | + 0.08f * (float)m_visualparams[(int)VPElement.SHOES_PLATFORM_HEIGHT] / 255.0f // Shoe platform height |
391 | + 0.07f * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT] / 255.0f // Shoe heel height | 391 | + 0.07f * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT] / 255.0f // Shoe heel height |
392 | + 0.076f * (float)m_visualparams[(int)VPElement.SHAPE_NECK_LENGTH] / 255.0f; // Neck length | 392 | + 0.076f * (float)m_visualparams[(int)VPElement.SHAPE_NECK_LENGTH] / 255.0f; // Neck length |
393 | m_hipOffset = (0.615385f // Half of avatar | 393 | m_hipOffset = (((1.23077f // Half of avatar |
394 | + 0.516945f * (float)m_visualparams[(int)VPElement.SHAPE_HEIGHT] / 255.0f // Body height | ||
395 | + 0.3836f * (float)m_visualparams[(int)VPElement.SHAPE_LEG_LENGTH] / 255.0f // Leg length | ||
394 | + 0.08f * (float)m_visualparams[(int)VPElement.SHOES_PLATFORM_HEIGHT] / 255.0f // Shoe platform height | 396 | + 0.08f * (float)m_visualparams[(int)VPElement.SHOES_PLATFORM_HEIGHT] / 255.0f // Shoe platform height |
395 | + 0.07f * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT] / 255.0f // Shoe heel height | 397 | + 0.07f * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT] / 255.0f // Shoe heel height |
396 | + 0.3836f * (float)m_visualparams[(int)VPElement.SHAPE_LEG_LENGTH] / 255.0f // Leg length | 398 | ) / 2) - m_avatarHeight / 2) * 0.31f - 0.0425f; |
397 | - m_avatarHeight / 2) * 0.3f - 0.04f; | ||
398 | 399 | ||
399 | 400 | ||
400 | 401 | ||
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 3f53258..222bae0 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -152,6 +152,8 @@ namespace OpenSim.Framework | |||
152 | 152 | ||
153 | public delegate void AgentSit(IClientAPI remoteClient, UUID agentID); | 153 | public delegate void AgentSit(IClientAPI remoteClient, UUID agentID); |
154 | 154 | ||
155 | public delegate void LandUndo(IClientAPI remoteClient); | ||
156 | |||
155 | public delegate void AvatarPickerRequest(IClientAPI remoteClient, UUID agentdata, UUID queryID, string UserQuery); | 157 | public delegate void AvatarPickerRequest(IClientAPI remoteClient, UUID agentdata, UUID queryID, string UserQuery); |
156 | 158 | ||
157 | public delegate void GrabObject( | 159 | public delegate void GrabObject( |
@@ -419,9 +421,9 @@ namespace OpenSim.Framework | |||
419 | public delegate void AcceptCallingCard(IClientAPI remoteClient, UUID transactionID, UUID folderID); | 421 | public delegate void AcceptCallingCard(IClientAPI remoteClient, UUID transactionID, UUID folderID); |
420 | 422 | ||
421 | public delegate void DeclineCallingCard(IClientAPI remoteClient, UUID transactionID); | 423 | public delegate void DeclineCallingCard(IClientAPI remoteClient, UUID transactionID); |
422 | 424 | ||
423 | public delegate void SoundTrigger( | 425 | public delegate void SoundTrigger( |
424 | UUID soundId, UUID ownerid, UUID objid, UUID parentid, double Gain, Vector3 Position, UInt64 Handle); | 426 | UUID soundId, UUID ownerid, UUID objid, UUID parentid, double Gain, Vector3 Position, UInt64 Handle, float radius); |
425 | 427 | ||
426 | public delegate void StartLure(byte lureType, string message, UUID targetID, IClientAPI client); | 428 | public delegate void StartLure(byte lureType, string message, UUID targetID, IClientAPI client); |
427 | public delegate void TeleportLureRequest(UUID lureID, uint teleportFlags, IClientAPI client); | 429 | public delegate void TeleportLureRequest(UUID lureID, uint teleportFlags, IClientAPI client); |
@@ -988,6 +990,8 @@ namespace OpenSim.Framework | |||
988 | event ScriptAnswer OnScriptAnswer; | 990 | event ScriptAnswer OnScriptAnswer; |
989 | 991 | ||
990 | event AgentSit OnUndo; | 992 | event AgentSit OnUndo; |
993 | event AgentSit OnRedo; | ||
994 | event LandUndo OnLandUndo; | ||
991 | 995 | ||
992 | event ForceReleaseControls OnForceReleaseControls; | 996 | event ForceReleaseControls OnForceReleaseControls; |
993 | event GodLandStatRequest OnLandStatRequest; | 997 | event GodLandStatRequest OnLandStatRequest; |
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 071a667..060e886 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -358,6 +358,32 @@ namespace OpenSim.Framework | |||
358 | } | 358 | } |
359 | } | 359 | } |
360 | 360 | ||
361 | private int[] _mediaSize = new int[2]; | ||
362 | public int[] MediaSize | ||
363 | { | ||
364 | get | ||
365 | { | ||
366 | return _mediaSize; | ||
367 | } | ||
368 | set | ||
369 | { | ||
370 | _mediaSize = value; | ||
371 | } | ||
372 | } | ||
373 | |||
374 | private string _mediaType = ""; | ||
375 | public string MediaType | ||
376 | { | ||
377 | get | ||
378 | { | ||
379 | return _mediaType; | ||
380 | } | ||
381 | set | ||
382 | { | ||
383 | _mediaType = value; | ||
384 | } | ||
385 | } | ||
386 | |||
361 | /// <summary> | 387 | /// <summary> |
362 | /// URL to the shoutcast music stream to play on the parcel | 388 | /// URL to the shoutcast music stream to play on the parcel |
363 | /// </summary> | 389 | /// </summary> |