diff options
author | Melanie | 2010-03-03 02:07:03 +0000 |
---|---|---|
committer | Melanie | 2010-03-03 02:07:03 +0000 |
commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Client/VWoHTTP/ClientStack | |
parent | Revert "test" (diff) | |
parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
download | opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to 'OpenSim/Client/VWoHTTP/ClientStack')
-rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index cc4200c..d51277b 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
@@ -196,7 +196,11 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
196 | get { throw new System.NotImplementedException(); } | 196 | get { throw new System.NotImplementedException(); } |
197 | set { throw new System.NotImplementedException(); } | 197 | set { throw new System.NotImplementedException(); } |
198 | } | 198 | } |
199 | 199 | public bool IsLoggingOut | |
200 | { | ||
201 | get { throw new System.NotImplementedException(); } | ||
202 | set { throw new System.NotImplementedException(); } | ||
203 | } | ||
200 | public bool SendLogoutPacketWhenClosing | 204 | public bool SendLogoutPacketWhenClosing |
201 | { | 205 | { |
202 | set { throw new System.NotImplementedException(); } | 206 | set { throw new System.NotImplementedException(); } |
@@ -242,7 +246,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
242 | public event DeRezObject OnDeRezObject = delegate { }; | 246 | public event DeRezObject OnDeRezObject = delegate { }; |
243 | public event Action<IClientAPI> OnRegionHandShakeReply = delegate { }; | 247 | public event Action<IClientAPI> OnRegionHandShakeReply = delegate { }; |
244 | public event GenericCall2 OnRequestWearables = delegate { }; | 248 | public event GenericCall2 OnRequestWearables = delegate { }; |
245 | public event GenericCall2 OnCompleteMovementToRegion = delegate { }; | 249 | public event GenericCall1 OnCompleteMovementToRegion = delegate { }; |
246 | public event UpdateAgent OnAgentUpdate = delegate { }; | 250 | public event UpdateAgent OnAgentUpdate = delegate { }; |
247 | public event AgentRequestSit OnAgentRequestSit = delegate { }; | 251 | public event AgentRequestSit OnAgentRequestSit = delegate { }; |
248 | public event AgentSit OnAgentSit = delegate { }; | 252 | public event AgentSit OnAgentSit = delegate { }; |
@@ -343,6 +347,8 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
343 | public event UUIDNameRequest OnTeleportHomeRequest = delegate { }; | 347 | public event UUIDNameRequest OnTeleportHomeRequest = delegate { }; |
344 | public event ScriptAnswer OnScriptAnswer = delegate { }; | 348 | public event ScriptAnswer OnScriptAnswer = delegate { }; |
345 | public event AgentSit OnUndo = delegate { }; | 349 | public event AgentSit OnUndo = delegate { }; |
350 | public event AgentSit OnRedo = delegate { }; | ||
351 | public event LandUndo OnLandUndo = delegate { }; | ||
346 | public event ForceReleaseControls OnForceReleaseControls = delegate { }; | 352 | public event ForceReleaseControls OnForceReleaseControls = delegate { }; |
347 | public event GodLandStatRequest OnLandStatRequest = delegate { }; | 353 | public event GodLandStatRequest OnLandStatRequest = delegate { }; |
348 | public event DetailedEstateDataRequest OnDetailedEstateDataRequest = delegate { }; | 354 | public event DetailedEstateDataRequest OnDetailedEstateDataRequest = delegate { }; |
@@ -1204,5 +1210,9 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
1204 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) | 1210 | public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals) |
1205 | { | 1211 | { |
1206 | } | 1212 | } |
1213 | |||
1214 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) | ||
1215 | { | ||
1216 | } | ||
1207 | } | 1217 | } |
1208 | } | 1218 | } |