diff options
author | Melanie | 2010-01-04 21:41:33 +0000 |
---|---|---|
committer | Melanie | 2010-01-04 21:41:33 +0000 |
commit | 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch) | |
tree | badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Client/Sirikata/ClientStack | |
parent | Forgot to add these to the grid configs, so that logins work. (diff) | |
parent | Finish conversion if XInventoryService (diff) | |
download | opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Client/Sirikata/ClientStack')
-rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 65 |
1 files changed, 46 insertions, 19 deletions
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index 75b2347..66c0eb2 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 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 OpenSimulator 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 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Net; | 30 | using System.Net; |
4 | using System.Net.Sockets; | 31 | using System.Net.Sockets; |
@@ -375,24 +402,24 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
375 | public event MuteListRequest OnMuteListRequest; | 402 | public event MuteListRequest OnMuteListRequest; |
376 | public event PlacesQuery OnPlacesQuery; | 403 | public event PlacesQuery OnPlacesQuery; |
377 | public event FindAgentUpdate OnFindAgentEvent; | 404 | public event FindAgentUpdate OnFindAgentEvent; |
378 | public event TrackAgentUpdate OnTrackAgentEvent; | 405 | public event TrackAgentUpdate OnTrackAgentEvent; |
379 | public event NewUserReport OnUserReportEvent; | 406 | public event NewUserReport OnUserReportEvent; |
380 | public event SaveStateHandler OnSaveStateEvent; | 407 | public event SaveStateHandler OnSaveStateEvent; |
381 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; | 408 | public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest; |
382 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; | 409 | public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest; |
383 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; | 410 | public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest; |
384 | public event FreezeUserUpdate OnParcelFreezeUserEvent; | 411 | public event FreezeUserUpdate OnParcelFreezeUserEvent; |
385 | public event EjectUserUpdate OnParcelEjectUserEvent; | 412 | public event EjectUserUpdate OnParcelEjectUserEvent; |
386 | public event ParcelBuyPass OnParcelBuyPass; | 413 | public event ParcelBuyPass OnParcelBuyPass; |
387 | public event ParcelGodMark OnParcelGodMark; | 414 | public event ParcelGodMark OnParcelGodMark; |
388 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; | 415 | public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest; |
389 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 416 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
390 | public event SimWideDeletesDelegate OnSimWideDeletes; | 417 | public event SimWideDeletesDelegate OnSimWideDeletes; |
391 | public event SendPostcard OnSendPostcard; | 418 | public event SendPostcard OnSendPostcard; |
392 | public event MuteListEntryUpdate OnUpdateMuteListEntryEvent; | 419 | public event MuteListEntryUpdate OnUpdateMuteListEntryEvent; |
393 | public event MuteListEntryRemove OnRemoveMuteListEntryEvent; | 420 | public event MuteListEntryRemove OnRemoveMuteListEntryEvent; |
394 | public event GodlikeMessage onGodlikeMessageEvent; | 421 | public event GodlikeMessage onGodlikeMessageEvent; |
395 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; | 422 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent; |
396 | public void SetDebugPacketLevel(int newDebug) | 423 | public void SetDebugPacketLevel(int newDebug) |
397 | { | 424 | { |
398 | throw new System.NotImplementedException(); | 425 | throw new System.NotImplementedException(); |