aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Client')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs31
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs60
-rw-r--r--OpenSim/Client/Sirikata/Protocol/MessageHeader.pbj.cs27
-rw-r--r--OpenSim/Client/Sirikata/Protocol/PBJ.cs29
-rw-r--r--OpenSim/Client/Sirikata/Protocol/Persistence.pbj.cs45
-rw-r--r--OpenSim/Client/Sirikata/Protocol/Physics.pbj.cs27
-rw-r--r--OpenSim/Client/Sirikata/Protocol/Sirikata.pbj.cs29
-rw-r--r--OpenSim/Client/Sirikata/Protocol/Subscription.pbj.cs27
-rw-r--r--OpenSim/Client/Sirikata/Protocol/Test.pbj.cs33
-rw-r--r--OpenSim/Client/Sirikata/Protocol/Time.pbj.cs27
-rw-r--r--OpenSim/Client/Sirikata/SirikataModule.cs4
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs31
12 files changed, 353 insertions, 17 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 6e04a40..1ad1fce 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -756,6 +756,25 @@ namespace OpenSim.Client.MXP.ClientStack
756 public event AvatarNotesUpdate OnAvatarNotesUpdate; 756 public event AvatarNotesUpdate OnAvatarNotesUpdate;
757 public event MuteListRequest OnMuteListRequest; 757 public event MuteListRequest OnMuteListRequest;
758 public event AvatarInterestUpdate OnAvatarInterestUpdate; 758 public event AvatarInterestUpdate OnAvatarInterestUpdate;
759 public event FindAgentUpdate OnFindAgentEvent;
760 public event TrackAgentUpdate OnTrackAgentEvent;
761 public event NewUserReport OnUserReportEvent;
762 public event SaveStateHandler OnSaveStateEvent;
763 public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
764 public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
765 public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
766 public event FreezeUserUpdate OnParcelFreezeUserEvent;
767 public event EjectUserUpdate OnParcelEjectUserEvent;
768 public event ParcelBuyPass OnParcelBuyPass;
769 public event ParcelGodMark OnParcelGodMark;
770 public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
771 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
772 public event SimWideDeletesDelegate OnSimWideDeletes;
773 public event SendPostcard OnSendPostcard;
774 public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
775 public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
776 public event GodlikeMessage onGodlikeMessageEvent;
777 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
759 778
760 public event PlacesQuery OnPlacesQuery; 779 public event PlacesQuery OnPlacesQuery;
761 780
@@ -1659,5 +1678,17 @@ namespace OpenSim.Client.MXP.ClientStack
1659 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages) 1678 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
1660 { 1679 {
1661 } 1680 }
1681
1682 public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
1683 {
1684 }
1685
1686 public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
1687 {
1688 }
1689
1690 public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
1691 {
1692 }
1662 } 1693 }
1663} 1694}
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 4700bf2..108eab1 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -1,4 +1,31 @@
1using 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
28using System;
2using System.Collections.Generic; 29using System.Collections.Generic;
3using System.Net; 30using System.Net;
4using System.Net.Sockets; 31using System.Net.Sockets;
@@ -374,6 +401,25 @@ namespace OpenSim.Client.Sirikata.ClientStack
374 public event GrantUserFriendRights OnGrantUserRights; 401 public event GrantUserFriendRights OnGrantUserRights;
375 public event MuteListRequest OnMuteListRequest; 402 public event MuteListRequest OnMuteListRequest;
376 public event PlacesQuery OnPlacesQuery; 403 public event PlacesQuery OnPlacesQuery;
404 public event FindAgentUpdate OnFindAgentEvent;
405 public event TrackAgentUpdate OnTrackAgentEvent;
406 public event NewUserReport OnUserReportEvent;
407 public event SaveStateHandler OnSaveStateEvent;
408 public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
409 public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
410 public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
411 public event FreezeUserUpdate OnParcelFreezeUserEvent;
412 public event EjectUserUpdate OnParcelEjectUserEvent;
413 public event ParcelBuyPass OnParcelBuyPass;
414 public event ParcelGodMark OnParcelGodMark;
415 public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
416 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
417 public event SimWideDeletesDelegate OnSimWideDeletes;
418 public event SendPostcard OnSendPostcard;
419 public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
420 public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
421 public event GodlikeMessage onGodlikeMessageEvent;
422 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
377 public void SetDebugPacketLevel(int newDebug) 423 public void SetDebugPacketLevel(int newDebug)
378 { 424 {
379 throw new System.NotImplementedException(); 425 throw new System.NotImplementedException();
@@ -1121,6 +1167,18 @@ namespace OpenSim.Client.Sirikata.ClientStack
1121 { 1167 {
1122 throw new System.NotImplementedException(); 1168 throw new System.NotImplementedException();
1123 } 1169 }
1170
1171 public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
1172 {
1173 }
1174
1175 public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
1176 {
1177 }
1178
1179 public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
1180 {
1181 }
1124 1182
1125 #endregion 1183 #endregion
1126 } 1184 }
diff --git a/OpenSim/Client/Sirikata/Protocol/MessageHeader.pbj.cs b/OpenSim/Client/Sirikata/Protocol/MessageHeader.pbj.cs
index eadb43b..fb4963f 100644
--- a/OpenSim/Client/Sirikata/Protocol/MessageHeader.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/MessageHeader.pbj.cs
@@ -1,3 +1,30 @@
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
1using pbd = global::Google.ProtocolBuffers.Descriptors; 28using pbd = global::Google.ProtocolBuffers.Descriptors;
2using pb = global::Google.ProtocolBuffers; 29using pb = global::Google.ProtocolBuffers;
3namespace Sirikata.Protocol { 30namespace Sirikata.Protocol {
diff --git a/OpenSim/Client/Sirikata/Protocol/PBJ.cs b/OpenSim/Client/Sirikata/Protocol/PBJ.cs
index 46888b5..9b1951a 100644
--- a/OpenSim/Client/Sirikata/Protocol/PBJ.cs
+++ b/OpenSim/Client/Sirikata/Protocol/PBJ.cs
@@ -1,4 +1,31 @@
1using 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
28using System;
2namespace PBJ 29namespace PBJ
3{ 30{
4 31
diff --git a/OpenSim/Client/Sirikata/Protocol/Persistence.pbj.cs b/OpenSim/Client/Sirikata/Protocol/Persistence.pbj.cs
index 54ca1f4..196b0b9 100644
--- a/OpenSim/Client/Sirikata/Protocol/Persistence.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Persistence.pbj.cs
@@ -1,3 +1,30 @@
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
1using pbd = global::Google.ProtocolBuffers.Descriptors; 28using pbd = global::Google.ProtocolBuffers.Descriptors;
2using pb = global::Google.ProtocolBuffers; 29using pb = global::Google.ProtocolBuffers;
3namespace Sirikata.Persistence.Protocol { 30namespace Sirikata.Persistence.Protocol {
@@ -812,7 +839,7 @@ namespace Sirikata.Persistence.Protocol {
812 public StorageElement Reads(int index) { 839 public StorageElement Reads(int index) {
813 return new StorageElement(super.GetReads(index)); 840 return new StorageElement(super.GetReads(index));
814 } 841 }
815 public Builder AddReads(StorageElement value ) { 842 public Builder AddReads(StorageElement value) {
816 super.AddReads(value._PBJSuper); 843 super.AddReads(value._PBJSuper);
817 return this; 844 return this;
818 } 845 }
@@ -919,7 +946,7 @@ namespace Sirikata.Persistence.Protocol {
919 public StorageElement Reads(int index) { 946 public StorageElement Reads(int index) {
920 return new StorageElement(super.GetReads(index)); 947 return new StorageElement(super.GetReads(index));
921 } 948 }
922 public Builder AddReads(StorageElement value ) { 949 public Builder AddReads(StorageElement value) {
923 super.AddReads(value._PBJSuper); 950 super.AddReads(value._PBJSuper);
924 return this; 951 return this;
925 } 952 }
@@ -1026,7 +1053,7 @@ namespace Sirikata.Persistence.Protocol {
1026 public StorageElement Writes(int index) { 1053 public StorageElement Writes(int index) {
1027 return new StorageElement(super.GetWrites(index)); 1054 return new StorageElement(super.GetWrites(index));
1028 } 1055 }
1029 public Builder AddWrites(StorageElement value ) { 1056 public Builder AddWrites(StorageElement value) {
1030 super.AddWrites(value._PBJSuper); 1057 super.AddWrites(value._PBJSuper);
1031 return this; 1058 return this;
1032 } 1059 }
@@ -1155,7 +1182,7 @@ namespace Sirikata.Persistence.Protocol {
1155 public StorageElement Reads(int index) { 1182 public StorageElement Reads(int index) {
1156 return new StorageElement(super.GetReads(index)); 1183 return new StorageElement(super.GetReads(index));
1157 } 1184 }
1158 public Builder AddReads(StorageElement value ) { 1185 public Builder AddReads(StorageElement value) {
1159 super.AddReads(value._PBJSuper); 1186 super.AddReads(value._PBJSuper);
1160 return this; 1187 return this;
1161 } 1188 }
@@ -1170,7 +1197,7 @@ namespace Sirikata.Persistence.Protocol {
1170 public StorageElement Writes(int index) { 1197 public StorageElement Writes(int index) {
1171 return new StorageElement(super.GetWrites(index)); 1198 return new StorageElement(super.GetWrites(index));
1172 } 1199 }
1173 public Builder AddWrites(StorageElement value ) { 1200 public Builder AddWrites(StorageElement value) {
1174 super.AddWrites(value._PBJSuper); 1201 super.AddWrites(value._PBJSuper);
1175 return this; 1202 return this;
1176 } 1203 }
@@ -1322,7 +1349,7 @@ namespace Sirikata.Persistence.Protocol {
1322 public StorageElement Reads(int index) { 1349 public StorageElement Reads(int index) {
1323 return new StorageElement(super.GetReads(index)); 1350 return new StorageElement(super.GetReads(index));
1324 } 1351 }
1325 public Builder AddReads(StorageElement value ) { 1352 public Builder AddReads(StorageElement value) {
1326 super.AddReads(value._PBJSuper); 1353 super.AddReads(value._PBJSuper);
1327 return this; 1354 return this;
1328 } 1355 }
@@ -1337,7 +1364,7 @@ namespace Sirikata.Persistence.Protocol {
1337 public StorageElement Writes(int index) { 1364 public StorageElement Writes(int index) {
1338 return new StorageElement(super.GetWrites(index)); 1365 return new StorageElement(super.GetWrites(index));
1339 } 1366 }
1340 public Builder AddWrites(StorageElement value ) { 1367 public Builder AddWrites(StorageElement value) {
1341 super.AddWrites(value._PBJSuper); 1368 super.AddWrites(value._PBJSuper);
1342 return this; 1369 return this;
1343 } 1370 }
@@ -1352,7 +1379,7 @@ namespace Sirikata.Persistence.Protocol {
1352 public CompareElement Compares(int index) { 1379 public CompareElement Compares(int index) {
1353 return new CompareElement(super.GetCompares(index)); 1380 return new CompareElement(super.GetCompares(index));
1354 } 1381 }
1355 public Builder AddCompares(CompareElement value ) { 1382 public Builder AddCompares(CompareElement value) {
1356 super.AddCompares(value._PBJSuper); 1383 super.AddCompares(value._PBJSuper);
1357 return this; 1384 return this;
1358 } 1385 }
@@ -1493,7 +1520,7 @@ namespace Sirikata.Persistence.Protocol {
1493 public StorageElement Reads(int index) { 1520 public StorageElement Reads(int index) {
1494 return new StorageElement(super.GetReads(index)); 1521 return new StorageElement(super.GetReads(index));
1495 } 1522 }
1496 public Builder AddReads(StorageElement value ) { 1523 public Builder AddReads(StorageElement value) {
1497 super.AddReads(value._PBJSuper); 1524 super.AddReads(value._PBJSuper);
1498 return this; 1525 return this;
1499 } 1526 }
diff --git a/OpenSim/Client/Sirikata/Protocol/Physics.pbj.cs b/OpenSim/Client/Sirikata/Protocol/Physics.pbj.cs
index decd204..9fb5a28 100644
--- a/OpenSim/Client/Sirikata/Protocol/Physics.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Physics.pbj.cs
@@ -1,3 +1,30 @@
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
1using pbd = global::Google.ProtocolBuffers.Descriptors; 28using pbd = global::Google.ProtocolBuffers.Descriptors;
2using pb = global::Google.ProtocolBuffers; 29using pb = global::Google.ProtocolBuffers;
3namespace Sirikata.Physics.Protocol { 30namespace Sirikata.Physics.Protocol {
diff --git a/OpenSim/Client/Sirikata/Protocol/Sirikata.pbj.cs b/OpenSim/Client/Sirikata/Protocol/Sirikata.pbj.cs
index 9c0e3e7..fcf0152 100644
--- a/OpenSim/Client/Sirikata/Protocol/Sirikata.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Sirikata.pbj.cs
@@ -1,3 +1,30 @@
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
1using pbd = global::Google.ProtocolBuffers.Descriptors; 28using pbd = global::Google.ProtocolBuffers.Descriptors;
2using pb = global::Google.ProtocolBuffers; 29using pb = global::Google.ProtocolBuffers;
3namespace Sirikata.Protocol { 30namespace Sirikata.Protocol {
@@ -3809,7 +3836,7 @@ namespace Sirikata.Protocol {
3809 public ConnectToSpace SpaceProperties(int index) { 3836 public ConnectToSpace SpaceProperties(int index) {
3810 return new ConnectToSpace(super.GetSpaceProperties(index)); 3837 return new ConnectToSpace(super.GetSpaceProperties(index));
3811 } 3838 }
3812 public Builder AddSpaceProperties(ConnectToSpace value ) { 3839 public Builder AddSpaceProperties(ConnectToSpace value) {
3813 super.AddSpaceProperties(value._PBJSuper); 3840 super.AddSpaceProperties(value._PBJSuper);
3814 return this; 3841 return this;
3815 } 3842 }
diff --git a/OpenSim/Client/Sirikata/Protocol/Subscription.pbj.cs b/OpenSim/Client/Sirikata/Protocol/Subscription.pbj.cs
index ca6c7e8..c8c2fbf 100644
--- a/OpenSim/Client/Sirikata/Protocol/Subscription.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Subscription.pbj.cs
@@ -1,3 +1,30 @@
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
1using pbd = global::Google.ProtocolBuffers.Descriptors; 28using pbd = global::Google.ProtocolBuffers.Descriptors;
2using pb = global::Google.ProtocolBuffers; 29using pb = global::Google.ProtocolBuffers;
3namespace Sirikata.Subscription.Protocol { 30namespace Sirikata.Subscription.Protocol {
diff --git a/OpenSim/Client/Sirikata/Protocol/Test.pbj.cs b/OpenSim/Client/Sirikata/Protocol/Test.pbj.cs
index c753c36..bcd02fa 100644
--- a/OpenSim/Client/Sirikata/Protocol/Test.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Test.pbj.cs
@@ -1,3 +1,30 @@
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
1using pbd = global::Google.ProtocolBuffers.Descriptors; 28using pbd = global::Google.ProtocolBuffers.Descriptors;
2using pb = global::Google.ProtocolBuffers; 29using pb = global::Google.ProtocolBuffers;
3namespace Sirikata.PB { 30namespace Sirikata.PB {
@@ -407,7 +434,7 @@ namespace Sirikata.PB {
407 public Types.SubMessage Submessers(int index) { 434 public Types.SubMessage Submessers(int index) {
408 return new Types.SubMessage(super.GetSubmessers(index)); 435 return new Types.SubMessage(super.GetSubmessers(index));
409 } 436 }
410 public Builder AddSubmessers(Types.SubMessage value ) { 437 public Builder AddSubmessers(Types.SubMessage value) {
411 super.AddSubmessers(value._PBJSuper); 438 super.AddSubmessers(value._PBJSuper);
412 return this; 439 return this;
413 } 440 }
@@ -1651,7 +1678,7 @@ namespace Sirikata.PB {
1651 public Types.SubMessage Submessers(int index) { 1678 public Types.SubMessage Submessers(int index) {
1652 return new Types.SubMessage(super.GetSubmessers(index)); 1679 return new Types.SubMessage(super.GetSubmessers(index));
1653 } 1680 }
1654 public Builder AddSubmessers(Types.SubMessage value ) { 1681 public Builder AddSubmessers(Types.SubMessage value) {
1655 super.AddSubmessers(value._PBJSuper); 1682 super.AddSubmessers(value._PBJSuper);
1656 return this; 1683 return this;
1657 } 1684 }
@@ -1709,7 +1736,7 @@ namespace Sirikata.PB {
1709 public ExternalMessage Extmessers(int index) { 1736 public ExternalMessage Extmessers(int index) {
1710 return new ExternalMessage(super.GetExtmessers(index)); 1737 return new ExternalMessage(super.GetExtmessers(index));
1711 } 1738 }
1712 public Builder AddExtmessers(ExternalMessage value ) { 1739 public Builder AddExtmessers(ExternalMessage value) {
1713 super.AddExtmessers(value._PBJSuper); 1740 super.AddExtmessers(value._PBJSuper);
1714 return this; 1741 return this;
1715 } 1742 }
diff --git a/OpenSim/Client/Sirikata/Protocol/Time.pbj.cs b/OpenSim/Client/Sirikata/Protocol/Time.pbj.cs
index c3e9e73..15b4ae7 100644
--- a/OpenSim/Client/Sirikata/Protocol/Time.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Time.pbj.cs
@@ -1,3 +1,30 @@
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
1using pbd = global::Google.ProtocolBuffers.Descriptors; 28using pbd = global::Google.ProtocolBuffers.Descriptors;
2using pb = global::Google.ProtocolBuffers; 29using pb = global::Google.ProtocolBuffers;
3namespace Sirikata.Network.Protocol { 30namespace Sirikata.Network.Protocol {
diff --git a/OpenSim/Client/Sirikata/SirikataModule.cs b/OpenSim/Client/Sirikata/SirikataModule.cs
index cbb6c23..01dc9d7 100644
--- a/OpenSim/Client/Sirikata/SirikataModule.cs
+++ b/OpenSim/Client/Sirikata/SirikataModule.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Client.Sirikata
93 93
94 public void PostInitialise() 94 public void PostInitialise()
95 { 95 {
96 if(!m_enabled) 96 if (!m_enabled)
97 return; 97 return;
98 98
99 m_listener = new TcpListener(IPAddress.Any, 5943); 99 m_listener = new TcpListener(IPAddress.Any, 5943);
@@ -102,7 +102,7 @@ namespace OpenSim.Client.Sirikata
102 102
103 private void ListenLoop() 103 private void ListenLoop()
104 { 104 {
105 while(m_running) 105 while (m_running)
106 { 106 {
107 m_listener.BeginAcceptTcpClient(AcceptSocket, m_listener); 107 m_listener.BeginAcceptTcpClient(AcceptSocket, m_listener);
108 } 108 }
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 02b1dee..e1418d8 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -405,6 +405,25 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
405 public event MuteListRequest OnMuteListRequest = delegate { }; 405 public event MuteListRequest OnMuteListRequest = delegate { };
406 public event AvatarInterestUpdate OnAvatarInterestUpdate = delegate { }; 406 public event AvatarInterestUpdate OnAvatarInterestUpdate = delegate { };
407 public event PlacesQuery OnPlacesQuery = delegate { }; 407 public event PlacesQuery OnPlacesQuery = delegate { };
408 public event FindAgentUpdate OnFindAgentEvent = delegate { };
409 public event TrackAgentUpdate OnTrackAgentEvent = delegate { };
410 public event NewUserReport OnUserReportEvent = delegate { };
411 public event SaveStateHandler OnSaveStateEvent = delegate { };
412 public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest = delegate { };
413 public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest = delegate { };
414 public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest = delegate { };
415 public event FreezeUserUpdate OnParcelFreezeUserEvent = delegate { };
416 public event EjectUserUpdate OnParcelEjectUserEvent = delegate { };
417 public event ParcelBuyPass OnParcelBuyPass = delegate { };
418 public event ParcelGodMark OnParcelGodMark = delegate { };
419 public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest = delegate { };
420 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest = delegate { };
421 public event SimWideDeletesDelegate OnSimWideDeletes = delegate { };
422 public event SendPostcard OnSendPostcard = delegate { };
423 public event MuteListEntryUpdate OnUpdateMuteListEntryEvent = delegate { };
424 public event MuteListEntryRemove OnRemoveMuteListEntryEvent = delegate { };
425 public event GodlikeMessage onGodlikeMessageEvent = delegate { };
426 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent = delegate { };
408 427
409 428
410 429
@@ -1165,5 +1184,17 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
1165 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages) 1184 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
1166 { 1185 {
1167 } 1186 }
1187
1188 public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
1189 {
1190 }
1191
1192 public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
1193 {
1194 }
1195
1196 public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
1197 {
1198 }
1168 } 1199 }
1169} 1200}
generated by cgit v1.1 at 2024-11-10 17:25:16 +0000