diff options
| author | Melanie | 2012-07-19 12:28:50 +0200 |
|---|---|---|
| committer | Melanie | 2012-07-19 12:28:50 +0200 |
| commit | 0d595ab19e0f693aad4a6f265151a8d988ce9061 (patch) | |
| tree | b081212c8156835c7a3a229398802ed6fae9ad67 /OpenSim/Region/ScriptEngine | |
| parent | Fix slow loading of task inventory (diff) | |
| parent | Update ubitMesh primMesher with new Dahlia version on core ( reckick git (diff) | |
| download | opensim-SC-0d595ab19e0f693aad4a6f265151a8d988ce9061.zip opensim-SC-0d595ab19e0f693aad4a6f265151a8d988ce9061.tar.gz opensim-SC-0d595ab19e0f693aad4a6f265151a8d988ce9061.tar.bz2 opensim-SC-0d595ab19e0f693aad4a6f265151a8d988ce9061.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 7cb4a26..977f39e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | using System; | 28 | using System; |
| 29 | using System.Collections; | 29 | using System.Collections; |
| 30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |