diff options
author | Teravus Ovares | 2008-05-25 11:22:05 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-05-25 11:22:05 +0000 |
commit | 042c9ed4d82e4389ec929f5438e82defad251235 (patch) | |
tree | 002d741e83cec0ee1a715603af7af5aacb5d079a /OpenSim/Framework | |
parent | * phantom sculpties don't request the sculpt texture anymore. (diff) | |
download | opensim-SC_OLD-042c9ed4d82e4389ec929f5438e82defad251235.zip opensim-SC_OLD-042c9ed4d82e4389ec929f5438e82defad251235.tar.gz opensim-SC_OLD-042c9ed4d82e4389ec929f5438e82defad251235.tar.bz2 opensim-SC_OLD-042c9ed4d82e4389ec929f5438e82defad251235.tar.xz |
* Adds Top Colliders when using ODE. Access it from the estate tools/debug tab.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 6 | ||||
-rw-r--r-- | OpenSim/Framework/LandStatReportItem.cs | 54 |
2 files changed, 60 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index f260245..0823b0d 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -610,6 +610,8 @@ namespace OpenSim.Framework | |||
610 | 610 | ||
611 | public delegate void ForceReleaseControls(IClientAPI remoteClient, LLUUID agentID); | 611 | public delegate void ForceReleaseControls(IClientAPI remoteClient, LLUUID agentID); |
612 | 612 | ||
613 | public delegate void GodLandStatRequest(int parcelID, uint reportType, uint requestflags, string filter, IClientAPI remoteClient); | ||
614 | |||
613 | //Estate Requests | 615 | //Estate Requests |
614 | public delegate void DetailedEstateDataRequest(IClientAPI remoteClient, LLUUID invoice); | 616 | public delegate void DetailedEstateDataRequest(IClientAPI remoteClient, LLUUID invoice); |
615 | public delegate void SetEstateFlagsRequest(bool blockTerraform, bool noFly, bool allowDamage, bool blockLandResell, int maxAgents, float objectBonusFactor, int matureLevel, bool restrictPushObject, bool allowParcelChanges); | 617 | public delegate void SetEstateFlagsRequest(bool blockTerraform, bool noFly, bool allowDamage, bool blockLandResell, int maxAgents, float objectBonusFactor, int matureLevel, bool restrictPushObject, bool allowParcelChanges); |
@@ -626,6 +628,7 @@ namespace OpenSim.Framework | |||
626 | public delegate void EstateDebugRegionRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, bool scripted, bool collisionEvents, bool physics); | 628 | public delegate void EstateDebugRegionRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, bool scripted, bool collisionEvents, bool physics); |
627 | public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID prey); | 629 | public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID prey); |
628 | 630 | ||
631 | |||
629 | public interface IClientAPI | 632 | public interface IClientAPI |
630 | { | 633 | { |
631 | LLVector3 StartPos { get; set; } | 634 | LLVector3 StartPos { get; set; } |
@@ -801,6 +804,7 @@ namespace OpenSim.Framework | |||
801 | event AgentSit OnUndo; | 804 | event AgentSit OnUndo; |
802 | 805 | ||
803 | event ForceReleaseControls OnForceReleaseControls; | 806 | event ForceReleaseControls OnForceReleaseControls; |
807 | event GodLandStatRequest OnLandStatRequest; | ||
804 | 808 | ||
805 | event DetailedEstateDataRequest OnDetailedEstateDataRequest; | 809 | event DetailedEstateDataRequest OnDetailedEstateDataRequest; |
806 | event SetEstateFlagsRequest OnSetEstateFlagsRequest; | 810 | event SetEstateFlagsRequest OnSetEstateFlagsRequest; |
@@ -989,6 +993,8 @@ namespace OpenSim.Framework | |||
989 | 993 | ||
990 | void SendGroupNameReply(LLUUID groupLLUID, string GroupName); | 994 | void SendGroupNameReply(LLUUID groupLLUID, string GroupName); |
991 | 995 | ||
996 | void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia); | ||
997 | |||
992 | byte[] GetThrottlesPacked(float multiplier); | 998 | byte[] GetThrottlesPacked(float multiplier); |
993 | 999 | ||
994 | 1000 | ||
diff --git a/OpenSim/Framework/LandStatReportItem.cs b/OpenSim/Framework/LandStatReportItem.cs new file mode 100644 index 0000000..3a92253 --- /dev/null +++ b/OpenSim/Framework/LandStatReportItem.cs | |||
@@ -0,0 +1,54 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | |||
29 | using System; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Text; | ||
32 | using libsecondlife; | ||
33 | |||
34 | |||
35 | namespace OpenSim.Framework | ||
36 | { | ||
37 | public class LandStatReportItem | ||
38 | { | ||
39 | public float LocationX; | ||
40 | public float LocationY; | ||
41 | public float LocationZ; | ||
42 | public string OwnerName; | ||
43 | public float Score; | ||
44 | public LLUUID TaskID; | ||
45 | public uint TaskLocalID; | ||
46 | public string TaskName; | ||
47 | |||
48 | public LandStatReportItem() | ||
49 | { | ||
50 | |||
51 | } | ||
52 | |||
53 | } | ||
54 | } | ||