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/Protocol | |
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/Protocol')
-rw-r--r-- | OpenSim/Client/Sirikata/Protocol/MessageHeader.pbj.cs | 27 | ||||
-rw-r--r-- | OpenSim/Client/Sirikata/Protocol/PBJ.cs | 29 | ||||
-rw-r--r-- | OpenSim/Client/Sirikata/Protocol/Persistence.pbj.cs | 45 | ||||
-rw-r--r-- | OpenSim/Client/Sirikata/Protocol/Physics.pbj.cs | 27 | ||||
-rw-r--r-- | OpenSim/Client/Sirikata/Protocol/Sirikata.pbj.cs | 29 | ||||
-rw-r--r-- | OpenSim/Client/Sirikata/Protocol/Subscription.pbj.cs | 27 | ||||
-rw-r--r-- | OpenSim/Client/Sirikata/Protocol/Test.pbj.cs | 33 | ||||
-rw-r--r-- | OpenSim/Client/Sirikata/Protocol/Time.pbj.cs | 27 |
8 files changed, 230 insertions, 14 deletions
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 | |||
1 | using pbd = global::Google.ProtocolBuffers.Descriptors; | 28 | using pbd = global::Google.ProtocolBuffers.Descriptors; |
2 | using pb = global::Google.ProtocolBuffers; | 29 | using pb = global::Google.ProtocolBuffers; |
3 | namespace Sirikata.Protocol { | 30 | namespace 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 @@ | |||
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 | namespace PBJ | 29 | namespace 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 | |||
1 | using pbd = global::Google.ProtocolBuffers.Descriptors; | 28 | using pbd = global::Google.ProtocolBuffers.Descriptors; |
2 | using pb = global::Google.ProtocolBuffers; | 29 | using pb = global::Google.ProtocolBuffers; |
3 | namespace Sirikata.Persistence.Protocol { | 30 | namespace 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 | |||
1 | using pbd = global::Google.ProtocolBuffers.Descriptors; | 28 | using pbd = global::Google.ProtocolBuffers.Descriptors; |
2 | using pb = global::Google.ProtocolBuffers; | 29 | using pb = global::Google.ProtocolBuffers; |
3 | namespace Sirikata.Physics.Protocol { | 30 | namespace 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 | |||
1 | using pbd = global::Google.ProtocolBuffers.Descriptors; | 28 | using pbd = global::Google.ProtocolBuffers.Descriptors; |
2 | using pb = global::Google.ProtocolBuffers; | 29 | using pb = global::Google.ProtocolBuffers; |
3 | namespace Sirikata.Protocol { | 30 | namespace 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 | |||
1 | using pbd = global::Google.ProtocolBuffers.Descriptors; | 28 | using pbd = global::Google.ProtocolBuffers.Descriptors; |
2 | using pb = global::Google.ProtocolBuffers; | 29 | using pb = global::Google.ProtocolBuffers; |
3 | namespace Sirikata.Subscription.Protocol { | 30 | namespace 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 | |||
1 | using pbd = global::Google.ProtocolBuffers.Descriptors; | 28 | using pbd = global::Google.ProtocolBuffers.Descriptors; |
2 | using pb = global::Google.ProtocolBuffers; | 29 | using pb = global::Google.ProtocolBuffers; |
3 | namespace Sirikata.PB { | 30 | namespace 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 | |||
1 | using pbd = global::Google.ProtocolBuffers.Descriptors; | 28 | using pbd = global::Google.ProtocolBuffers.Descriptors; |
2 | using pb = global::Google.ProtocolBuffers; | 29 | using pb = global::Google.ProtocolBuffers; |
3 | namespace Sirikata.Network.Protocol { | 30 | namespace Sirikata.Network.Protocol { |