aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs13
-rw-r--r--ThirdPartyLicenses/MXP.txt67
-rw-r--r--ThirdPartyLicenses/Protobuf-net.txt207
3 files changed, 22 insertions, 265 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 8075d1b..6f82478 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -504,6 +504,7 @@ namespace OpenSim.Client.MXP.ClientStack
504 504
505 #region OpenSim Event Handlers 505 #region OpenSim Event Handlers
506 506
507 #pragma warning disable 67
507 public event GenericMessage OnGenericMessage; 508 public event GenericMessage OnGenericMessage;
508 public event ImprovedInstantMessage OnInstantMessage; 509 public event ImprovedInstantMessage OnInstantMessage;
509 public event ChatMessage OnChatFromClient; 510 public event ChatMessage OnChatFromClient;
@@ -681,6 +682,11 @@ namespace OpenSim.Client.MXP.ClientStack
681 public event ParcelDwellRequest OnParcelDwellRequest; 682 public event ParcelDwellRequest OnParcelDwellRequest;
682 public event UserInfoRequest OnUserInfoRequest; 683 public event UserInfoRequest OnUserInfoRequest;
683 public event UpdateUserInfo OnUpdateUserInfo; 684 public event UpdateUserInfo OnUpdateUserInfo;
685 public event ViewerEffectEventHandler OnViewerEffect;
686 public event Action<IClientAPI> OnLogout;
687 public event Action<IClientAPI> OnConnectionClosed;
688 public event RetrieveInstantMessages OnRetrieveInstantMessages;
689 #pragma warning restore 67
684 690
685 #endregion 691 #endregion
686 692
@@ -1330,13 +1336,6 @@ namespace OpenSim.Client.MXP.ClientStack
1330 return throttles; 1336 return throttles;
1331 } 1337 }
1332 1338
1333 public event ViewerEffectEventHandler OnViewerEffect;
1334 public event Action<IClientAPI> OnLogout;
1335 public event Action<IClientAPI> OnConnectionClosed;
1336
1337 public event RetrieveInstantMessages OnRetrieveInstantMessages;
1338
1339
1340 public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message) 1339 public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message)
1341 { 1340 {
1342 SendChatMessage(Message, 0, Vector3.Zero, FromAvatarName, UUID.Zero, 0, 0); 1341 SendChatMessage(Message, 0, Vector3.Zero, FromAvatarName, UUID.Zero, 0, 0);
diff --git a/ThirdPartyLicenses/MXP.txt b/ThirdPartyLicenses/MXP.txt
index 5b03181..43f51ce 100644
--- a/ThirdPartyLicenses/MXP.txt
+++ b/ThirdPartyLicenses/MXP.txt
@@ -1,60 +1,15 @@
1MXP Reference Implementation 1Metaverse Exchange Protocol specification and reference implementation.
2Code availible from: http://setp.googlecode.com/svn/trunk/
3http://www.bubblecloud.org
4 2
3Copyright 2008-2009 Bubble Cloud Comminity (http://www.bubblecloud.org)
5 4
6Apache License 5Licensed under the Apache License, Version 2.0 (the "License");
7Version 2.0, January 2004 6you may not use this file except in compliance with the License.
8http://www.apache.org/licenses/ 7You may obtain a copy of the License at
9 8
10TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 9http://www.apache.org/licenses/LICENSE-2.0
11 10
121. Definitions. 11Unless required by applicable law or agreed to in writing, software
13 12distributed under the License is distributed on an "AS IS" BASIS,
14"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. 13WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15 14See the License for the specific language governing permissions and
16"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. 15limitations under the License.
17
18"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
19
20"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
21
22"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
23
24"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
25
26"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
27
28"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
29
30"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
31
32"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
33
342. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
35
363. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
37
384. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
39
40 1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
41
42 2. You must cause any modified files to carry prominent notices stating that You changed the files; and
43
44 3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
45
46 4. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
47
48You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
49
505. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
51
526. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
53
547. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
55
568. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
57
589. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
59
60END OF TERMS AND CONDITIONS
diff --git a/ThirdPartyLicenses/Protobuf-net.txt b/ThirdPartyLicenses/Protobuf-net.txt
index 84148e0..8eb6c71 100644
--- a/ThirdPartyLicenses/Protobuf-net.txt
+++ b/ThirdPartyLicenses/Protobuf-net.txt
@@ -1,208 +1,11 @@
1Google protocol buffers home page: 1The core Protocol Buffers technology is provided courtesy of Google.
2At the time of writing, this is released under the BSD license.
3Full details can be found here:
2 4
3http://code.google.com/apis/protocolbuffers/docs/overview.html [^] 5http://code.google.com/p/protobuf/
4 6
5The .NET implementation which is licensed under Apache 2.0 License:
6 7
7http://code.google.com/p/protobuf-net/ [^] 8This .NET implementation is Copyright 2008 Marc Gravell
8
9Download link:
10
11http://protobuf-net.googlecode.com/files/protobuf-net%20r237.zip [^]
12
13I chose to NET2.0 version from the zip.
14
15---
16
17 Apache License
18 Version 2.0, January 2004
19 http://www.apache.org/licenses/
20
21 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
22
23 1. Definitions.
24
25 "License" shall mean the terms and conditions for use, reproduction,
26 and distribution as defined by Sections 1 through 9 of this document.
27
28 "Licensor" shall mean the copyright owner or entity authorized by
29 the copyright owner that is granting the License.
30
31 "Legal Entity" shall mean the union of the acting entity and all
32 other entities that control, are controlled by, or are under common
33 control with that entity. For the purposes of this definition,
34 "control" means (i) the power, direct or indirect, to cause the
35 direction or management of such entity, whether by contract or
36 otherwise, or (ii) ownership of fifty percent (50%) or more of the
37 outstanding shares, or (iii) beneficial ownership of such entity.
38
39 "You" (or "Your") shall mean an individual or Legal Entity
40 exercising permissions granted by this License.
41
42 "Source" form shall mean the preferred form for making modifications,
43 including but not limited to software source code, documentation
44 source, and configuration files.
45
46 "Object" form shall mean any form resulting from mechanical
47 transformation or translation of a Source form, including but
48 not limited to compiled object code, generated documentation,
49 and conversions to other media types.
50
51 "Work" shall mean the work of authorship, whether in Source or
52 Object form, made available under the License, as indicated by a
53 copyright notice that is included in or attached to the work
54 (an example is provided in the Appendix below).
55
56 "Derivative Works" shall mean any work, whether in Source or Object
57 form, that is based on (or derived from) the Work and for which the
58 editorial revisions, annotations, elaborations, or other modifications
59 represent, as a whole, an original work of authorship. For the purposes
60 of this License, Derivative Works shall not include works that remain
61 separable from, or merely link (or bind by name) to the interfaces of,
62 the Work and Derivative Works thereof.
63
64 "Contribution" shall mean any work of authorship, including
65 the original version of the Work and any modifications or additions
66 to that Work or Derivative Works thereof, that is intentionally
67 submitted to Licensor for inclusion in the Work by the copyright owner
68 or by an individual or Legal Entity authorized to submit on behalf of
69 the copyright owner. For the purposes of this definition, "submitted"
70 means any form of electronic, verbal, or written communication sent
71 to the Licensor or its representatives, including but not limited to
72 communication on electronic mailing lists, source code control systems,
73 and issue tracking systems that are managed by, or on behalf of, the
74 Licensor for the purpose of discussing and improving the Work, but
75 excluding communication that is conspicuously marked or otherwise
76 designated in writing by the copyright owner as "Not a Contribution."
77
78 "Contributor" shall mean Licensor and any individual or Legal Entity
79 on behalf of whom a Contribution has been received by Licensor and
80 subsequently incorporated within the Work.
81
82 2. Grant of Copyright License. Subject to the terms and conditions of
83 this License, each Contributor hereby grants to You a perpetual,
84 worldwide, non-exclusive, no-charge, royalty-free, irrevocable
85 copyright license to reproduce, prepare Derivative Works of,
86 publicly display, publicly perform, sublicense, and distribute the
87 Work and such Derivative Works in Source or Object form.
88
89 3. Grant of Patent License. Subject to the terms and conditions of
90 this License, each Contributor hereby grants to You a perpetual,
91 worldwide, non-exclusive, no-charge, royalty-free, irrevocable
92 (except as stated in this section) patent license to make, have made,
93 use, offer to sell, sell, import, and otherwise transfer the Work,
94 where such license applies only to those patent claims licensable
95 by such Contributor that are necessarily infringed by their
96 Contribution(s) alone or by combination of their Contribution(s)
97 with the Work to which such Contribution(s) was submitted. If You
98 institute patent litigation against any entity (including a
99 cross-claim or counterclaim in a lawsuit) alleging that the Work
100 or a Contribution incorporated within the Work constitutes direct
101 or contributory patent infringement, then any patent licenses
102 granted to You under this License for that Work shall terminate
103 as of the date such litigation is filed.
104
105 4. Redistribution. You may reproduce and distribute copies of the
106 Work or Derivative Works thereof in any medium, with or without
107 modifications, and in Source or Object form, provided that You
108 meet the following conditions:
109
110 (a) You must give any other recipients of the Work or
111 Derivative Works a copy of this License; and
112
113 (b) You must cause any modified files to carry prominent notices
114 stating that You changed the files; and
115
116 (c) You must retain, in the Source form of any Derivative Works
117 that You distribute, all copyright, patent, trademark, and
118 attribution notices from the Source form of the Work,
119 excluding those notices that do not pertain to any part of
120 the Derivative Works; and
121
122 (d) If the Work includes a "NOTICE" text file as part of its
123 distribution, then any Derivative Works that You distribute must
124 include a readable copy of the attribution notices contained
125 within such NOTICE file, excluding those notices that do not
126 pertain to any part of the Derivative Works, in at least one
127 of the following places: within a NOTICE text file distributed
128 as part of the Derivative Works; within the Source form or
129 documentation, if provided along with the Derivative Works; or,
130 within a display generated by the Derivative Works, if and
131 wherever such third-party notices normally appear. The contents
132 of the NOTICE file are for informational purposes only and
133 do not modify the License. You may add Your own attribution
134 notices within Derivative Works that You distribute, alongside
135 or as an addendum to the NOTICE text from the Work, provided
136 that such additional attribution notices cannot be construed
137 as modifying the License.
138
139 You may add Your own copyright statement to Your modifications and
140 may provide additional or different license terms and conditions
141 for use, reproduction, or distribution of Your modifications, or
142 for any such Derivative Works as a whole, provided Your use,
143 reproduction, and distribution of the Work otherwise complies with
144 the conditions stated in this License.
145
146 5. Submission of Contributions. Unless You explicitly state otherwise,
147 any Contribution intentionally submitted for inclusion in the Work
148 by You to the Licensor shall be under the terms and conditions of
149 this License, without any additional terms or conditions.
150 Notwithstanding the above, nothing herein shall supersede or modify
151 the terms of any separate license agreement you may have executed
152 with Licensor regarding such Contributions.
153
154 6. Trademarks. This License does not grant permission to use the trade
155 names, trademarks, service marks, or product names of the Licensor,
156 except as required for reasonable and customary use in describing the
157 origin of the Work and reproducing the content of the NOTICE file.
158
159 7. Disclaimer of Warranty. Unless required by applicable law or
160 agreed to in writing, Licensor provides the Work (and each
161 Contributor provides its Contributions) on an "AS IS" BASIS,
162 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
163 implied, including, without limitation, any warranties or conditions
164 of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
165 PARTICULAR PURPOSE. You are solely responsible for determining the
166 appropriateness of using or redistributing the Work and assume any
167 risks associated with Your exercise of permissions under this License.
168
169 8. Limitation of Liability. In no event and under no legal theory,
170 whether in tort (including negligence), contract, or otherwise,
171 unless required by applicable law (such as deliberate and grossly
172 negligent acts) or agreed to in writing, shall any Contributor be
173 liable to You for damages, including any direct, indirect, special,
174 incidental, or consequential damages of any character arising as a
175 result of this License or out of the use or inability to use the
176 Work (including but not limited to damages for loss of goodwill,
177 work stoppage, computer failure or malfunction, or any and all
178 other commercial damages or losses), even if such Contributor
179 has been advised of the possibility of such damages.
180
181 9. Accepting Warranty or Additional Liability. While redistributing
182 the Work or Derivative Works thereof, You may choose to offer,
183 and charge a fee for, acceptance of support, warranty, indemnity,
184 or other liability obligations and/or rights consistent with this
185 License. However, in accepting such obligations, You may act only
186 on Your own behalf and on Your sole responsibility, not on behalf
187 of any other Contributor, and only if You agree to indemnify,
188 defend, and hold each Contributor harmless for any liability
189 incurred by, or claims asserted against, such Contributor by reason
190 of your accepting any such warranty or additional liability.
191
192 END OF TERMS AND CONDITIONS
193
194 APPENDIX: How to apply the Apache License to your work.
195
196 To apply the Apache License to your work, attach the following
197 boilerplate notice, with the fields enclosed by brackets "[]"
198 replaced with your own identifying information. (Don't include
199 the brackets!) The text should be enclosed in the appropriate
200 comment syntax for the file format. We also recommend that a
201 file or class name and description of purpose be included on the
202 same "printed page" as the copyright notice for easier
203 identification within third-party archives.
204
205 Copyright [yyyy] [name of copyright owner]
206 9
207 Licensed under the Apache License, Version 2.0 (the "License"); 10 Licensed under the Apache License, Version 2.0 (the "License");
208 you may not use this file except in compliance with the License. 11 you may not use this file except in compliance with the License.