aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorAdam Frisby2009-04-05 02:51:10 +0000
committerAdam Frisby2009-04-05 02:51:10 +0000
commit9a4192d14e3cd6940c12928181d5ca363abece64 (patch)
tree44588213b55800a41f320c14b22c0f2a5e54e3c9 /OpenSim/Framework/Communications
parent* Minor cosmetic change to SEUser to get Bamboo to initiate another build. (grr) (diff)
downloadopensim-SC_OLD-9a4192d14e3cd6940c12928181d5ca363abece64.zip
opensim-SC_OLD-9a4192d14e3cd6940c12928181d5ca363abece64.tar.gz
opensim-SC_OLD-9a4192d14e3cd6940c12928181d5ca363abece64.tar.bz2
opensim-SC_OLD-9a4192d14e3cd6940c12928181d5ca363abece64.tar.xz
* Fixed copyright headers on HyperGrid source files. (Now match the rest of OpenSim, license text is unchanged)
* Added Bitmap[,] to IParcel for MRM
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/IHyperlink.cs49
-rw-r--r--OpenSim/Framework/Communications/Services/HGInventoryService.cs49
2 files changed, 48 insertions, 50 deletions
diff --git a/OpenSim/Framework/Communications/IHyperlink.cs b/OpenSim/Framework/Communications/IHyperlink.cs
index 6c61d82..b6c4981 100644
--- a/OpenSim/Framework/Communications/IHyperlink.cs
+++ b/OpenSim/Framework/Communications/IHyperlink.cs
@@ -1,29 +1,28 @@
1/** 1/*
2 * Copyright (c) 2008, Contributors. All rights reserved. 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without modification, 5 * Redistribution and use in source and binary forms, with or without
6 * are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 * * Redistributions of source code must retain the above copyright
8 * * Redistributions of source code must retain the above copyright notice, 8 * notice, this list of conditions and the following disclaimer.
9 * this list of conditions and the following disclaimer. 9 * * Redistributions in binary form must reproduce the above copyright
10 * * Redistributions in binary form must reproduce the above copyright notice, 10 * notice, this list of conditions and the following disclaimer in the
11 * this list of conditions and the following disclaimer in the documentation 11 * documentation and/or other materials provided with the distribution.
12 * and/or other materials provided with the distribution. 12 * * Neither the name of the OpenSim Project nor the
13 * * Neither the name of the Organizations nor the names of Individual 13 * names of its contributors may be used to endorse or promote products
14 * Contributors may be used to endorse or promote products derived from 14 * derived from this software without specific prior written permission.
15 * this software without specific prior written permission. 15 *
16 * 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 *
27 */ 26 */
28 27
29namespace OpenSim.Framework.Communications 28namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/Services/HGInventoryService.cs b/OpenSim/Framework/Communications/Services/HGInventoryService.cs
index adc2056..abb9b92 100644
--- a/OpenSim/Framework/Communications/Services/HGInventoryService.cs
+++ b/OpenSim/Framework/Communications/Services/HGInventoryService.cs
@@ -1,29 +1,28 @@
1/** 1/*
2 * Copyright (c) 2008, Contributors. All rights reserved. 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without modification, 5 * Redistribution and use in source and binary forms, with or without
6 * are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 * * Redistributions of source code must retain the above copyright
8 * * Redistributions of source code must retain the above copyright notice, 8 * notice, this list of conditions and the following disclaimer.
9 * this list of conditions and the following disclaimer. 9 * * Redistributions in binary form must reproduce the above copyright
10 * * Redistributions in binary form must reproduce the above copyright notice, 10 * notice, this list of conditions and the following disclaimer in the
11 * this list of conditions and the following disclaimer in the documentation 11 * documentation and/or other materials provided with the distribution.
12 * and/or other materials provided with the distribution. 12 * * Neither the name of the OpenSim Project nor the
13 * * Neither the name of the Organizations nor the names of Individual 13 * names of its contributors may be used to endorse or promote products
14 * Contributors may be used to endorse or promote products derived from 14 * derived from this software without specific prior written permission.
15 * this software without specific prior written permission. 15 *
16 * 16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 *
27 */ 26 */
28 27
29using System; 28using System;