aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-04 20:56:52 +0100
committerJustin Clark-Casey (justincc)2010-08-04 20:56:52 +0100
commita133acbd5fc1a402796dfeb014ade20db77d4824 (patch)
tree7aae3a2c1eabc0d17f917800e735cc88e8631e72 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parentBetter debug messages (diff)
parentAdd --merge switch to load iar. (diff)
downloadopensim-SC_OLD-a133acbd5fc1a402796dfeb014ade20db77d4824.zip
opensim-SC_OLD-a133acbd5fc1a402796dfeb014ade20db77d4824.tar.gz
opensim-SC_OLD-a133acbd5fc1a402796dfeb014ade20db77d4824.tar.bz2
opensim-SC_OLD-a133acbd5fc1a402796dfeb014ade20db77d4824.tar.xz
Merge branch 'iar-merge'
Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index fe71ed5..5ae6439 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 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 *