diff options
| author | Justin Clark-Casey (justincc) | 2013-06-07 19:12:55 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-06-07 19:12:55 +0100 |
| commit | a74e65200ce70b9f2b7adee0c65d51cb6a48df41 (patch) | |
| tree | 06f20a3b2f1af101d9cad20cddeafa761a49e47b /OpenSim/Region | |
| parent | In LocalFriendshipTerminated, send the original client's agentId to the frien... (diff) | |
| parent | Mantis #6620 (removed debug message) (diff) | |
| download | opensim-SC_OLD-a74e65200ce70b9f2b7adee0c65d51cb6a48df41.zip opensim-SC_OLD-a74e65200ce70b9f2b7adee0c65d51cb6a48df41.tar.gz opensim-SC_OLD-a74e65200ce70b9f2b7adee0c65d51cb6a48df41.tar.bz2 opensim-SC_OLD-a74e65200ce70b9f2b7adee0c65d51cb6a48df41.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index d773ee7..8a40278 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |||
| @@ -1,6 +1,29 @@ | |||
| 1 | // Proprietary code of Avination Virtual Limited | 1 | /* |
| 2 | // (c) 2012 Melanie Thielker | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
| 3 | // | 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 | */ | ||
| 4 | 27 | ||
| 5 | using System; | 28 | using System; |
| 6 | using System.Timers; | 29 | using System.Timers; |