diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 3 | ||||
-rw-r--r-- | OpenSim/Framework/LandData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Tests/AgentCircuitManagerTests.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Tests/ThreadTrackerTests.cs | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 1594c44..e451dd8 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -111,6 +111,8 @@ namespace OpenSim.Framework | |||
111 | 111 | ||
112 | public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); | 112 | public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); |
113 | 113 | ||
114 | public delegate void ObjectRequest(uint localID, IClientAPI remoteClient); | ||
115 | |||
114 | public delegate void RequestObjectPropertiesFamily( | 116 | public delegate void RequestObjectPropertiesFamily( |
115 | IClientAPI remoteClient, UUID AgentID, uint RequestFlags, UUID TaskID); | 117 | IClientAPI remoteClient, UUID AgentID, uint RequestFlags, UUID TaskID); |
116 | 118 | ||
@@ -622,6 +624,7 @@ namespace OpenSim.Framework | |||
622 | 624 | ||
623 | event UpdateShape OnUpdatePrimShape; | 625 | event UpdateShape OnUpdatePrimShape; |
624 | event ObjectExtraParams OnUpdateExtraParams; | 626 | event ObjectExtraParams OnUpdateExtraParams; |
627 | event ObjectRequest OnObjectRequest; | ||
625 | event ObjectSelect OnObjectSelect; | 628 | event ObjectSelect OnObjectSelect; |
626 | event ObjectDeselect OnObjectDeselect; | 629 | event ObjectDeselect OnObjectDeselect; |
627 | event GenericCall7 OnObjectDescription; | 630 | event GenericCall7 OnObjectDescription; |
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index a24af04..e639da0 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -520,7 +520,7 @@ namespace OpenSim.Framework | |||
520 | } | 520 | } |
521 | 521 | ||
522 | /// <summary> | 522 | /// <summary> |
523 | /// Depreciated idea. Number of visitors ~= free money | 523 | /// Deprecated idea. Number of visitors ~= free money |
524 | /// </summary> | 524 | /// </summary> |
525 | public int Dwell { | 525 | public int Dwell { |
526 | get { | 526 | get { |
diff --git a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs index ab5f04a..6c98897 100644 --- a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs +++ b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Tests | |||
64 | Vector3 StartPos = new Vector3(5, 23, 125); | 64 | Vector3 StartPos = new Vector3(5, 23, 125); |
65 | 65 | ||
66 | UUID SecureSessionId = UUID.Random(); | 66 | UUID SecureSessionId = UUID.Random(); |
67 | UUID SessionId = UUID.Random(); | 67 | // TODO: unused: UUID SessionId = UUID.Random(); |
68 | 68 | ||
69 | m_agentCircuitData1 = new AgentCircuitData(); | 69 | m_agentCircuitData1 = new AgentCircuitData(); |
70 | m_agentCircuitData1.AgentID = AgentId1; | 70 | m_agentCircuitData1.AgentID = AgentId1; |
diff --git a/OpenSim/Framework/Tests/ThreadTrackerTests.cs b/OpenSim/Framework/Tests/ThreadTrackerTests.cs index 37c75ef..15d5b73 100644 --- a/OpenSim/Framework/Tests/ThreadTrackerTests.cs +++ b/OpenSim/Framework/Tests/ThreadTrackerTests.cs | |||
@@ -161,7 +161,7 @@ namespace OpenSim.Framework.Tests | |||
161 | /// Worker thread 0 | 161 | /// Worker thread 0 |
162 | /// </summary> | 162 | /// </summary> |
163 | /// <param name="o"></param> | 163 | /// <param name="o"></param> |
164 | public void run( object o) | 164 | public void run(object o) |
165 | { | 165 | { |
166 | while (running) | 166 | while (running) |
167 | { | 167 | { |