diff options
| author | Melanie | 2012-03-22 20:38:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-22 20:38:49 +0000 |
| commit | 33818994810130117bae62ba2123bf8b55f181ea (patch) | |
| tree | eeb54ef00919abbd1a86b08a659570512856ac42 /OpenSim/Region/ClientStack/Linden | |
| parent | Revert "Stop messing order of updates, destroing the defined order of the sel... (diff) | |
| parent | Rework Diva's patch to simplify it (diff) | |
| download | opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.zip opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.gz opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.bz2 opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index ba5f4d5..c40c0ec 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -11418,15 +11418,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 11418 | scriptQuestion.Data.Questions = question; | 11418 | scriptQuestion.Data.Questions = question; |
| 11419 | scriptQuestion.Data.ObjectName = Util.StringToBytes256(taskName); | 11419 | scriptQuestion.Data.ObjectName = Util.StringToBytes256(taskName); |
| 11420 | scriptQuestion.Data.ObjectOwner = Util.StringToBytes256(ownerName); | 11420 | scriptQuestion.Data.ObjectOwner = Util.StringToBytes256(ownerName); |
| 11421 | 11421 | ||
| 11422 | OutPacket(scriptQuestion, ThrottleOutPacketType.Task); | 11422 | OutPacket(scriptQuestion, ThrottleOutPacketType.Task); |
| 11423 | } | 11423 | } |
| 11424 | 11424 | ||
| 11425 | public UUID GetDefaultAnimation(string name) | ||
| 11426 | { | ||
| 11427 | return SLUtil.GetDefaultAvatarAnimation(name); | ||
| 11428 | } | ||
| 11429 | |||
| 11430 | /// <summary> | 11425 | /// <summary> |
| 11431 | /// Handler called when we receive a logout packet. | 11426 | /// Handler called when we receive a logout packet. |
| 11432 | /// </summary> | 11427 | /// </summary> |