diff options
author | Jeff Ames | 2009-10-22 18:57:14 +0900 |
---|---|---|
committer | Jeff Ames | 2009-10-22 18:57:24 +0900 |
commit | d756fa01aea63e9b50be00a6f1f229ff7afef779 (patch) | |
tree | ae02bf546946d5eaddf3eec96979b6fac2784dc6 /OpenSim | |
parent | A synchronous call to the messaging server was blocking the process of promot... (diff) | |
download | opensim-SC-d756fa01aea63e9b50be00a6f1f229ff7afef779.zip opensim-SC-d756fa01aea63e9b50be00a6f1f229ff7afef779.tar.gz opensim-SC-d756fa01aea63e9b50be00a6f1f229ff7afef779.tar.bz2 opensim-SC-d756fa01aea63e9b50be00a6f1f229ff7afef779.tar.xz |
Add copyright header. Formatting cleanup.
Diffstat (limited to 'OpenSim')
-rw-r--r--[-rwxr-xr-x] | OpenSim/Framework/MinHeap.cs | 27 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 2 |
2 files changed, 28 insertions, 1 deletions
diff --git a/OpenSim/Framework/MinHeap.cs b/OpenSim/Framework/MinHeap.cs index ad39bbc..33d0364 100755..100644 --- a/OpenSim/Framework/MinHeap.cs +++ b/OpenSim/Framework/MinHeap.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 System; | 28 | using System; |
2 | using System.Threading; | 29 | using System.Threading; |
3 | using System.Collections; | 30 | using System.Collections; |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 0ba76ec..5acf25f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -827,7 +827,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
827 | for (int i = x1; i <= x2; i++) | 827 | for (int i = x1; i <= x2; i++) |
828 | SendLayerData(i, y1, map); | 828 | SendLayerData(i, y1, map); |
829 | 829 | ||
830 | // Column | 830 | // Column |
831 | for (int j = y1 + 1; j <= y2; j++) | 831 | for (int j = y1 + 1; j <= y2; j++) |
832 | SendLayerData(x2, j, map); | 832 | SendLayerData(x2, j, map); |
833 | 833 | ||