diff options
| author | Diva Canto | 2013-04-25 17:02:32 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-04-25 17:02:32 -0700 |
| commit | 2262b130482d54e6d61beacf9a403e2154f10019 (patch) | |
| tree | 6f719236db779bcc5492bb6ef9ccc1d4d5c2089c /OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs | |
| parent | Groups: make some methods protected. (diff) | |
| parent | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. Th... (diff) | |
| download | opensim-SC-2262b130482d54e6d61beacf9a403e2154f10019.zip opensim-SC-2262b130482d54e6d61beacf9a403e2154f10019.tar.gz opensim-SC-2262b130482d54e6d61beacf9a403e2154f10019.tar.bz2 opensim-SC-2262b130482d54e6d61beacf9a403e2154f10019.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs index 917911f..1ea1c20 100644 --- a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs +++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs | |||
| @@ -1,8 +1,29 @@ | |||
| 1 | // ****************************************************************** | 1 | /* |
| 2 | // Copyright (c) 2008, 2009 Melanie Thielker | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
| 3 | // | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
| 4 | // All rights reserved | 4 | * |
| 5 | // | 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 | */ | ||
| 6 | 27 | ||
| 7 | using System; | 28 | using System; |
| 8 | using System.IO; | 29 | using System.IO; |