aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-23 17:07:37 +0000
committerJustin Clarke Casey2009-01-23 17:07:37 +0000
commitddff7ab20e32664e09f06668f6e6250ea3b3abf7 (patch)
tree6dd80617df340bb3a9cff3d922c8809d7c4413ba /OpenSim/Region/ScriptEngine/Shared/Api
parent* Adds a synchronous jpeg decode for pre-caching purposes (diff)
downloadopensim-SC-ddff7ab20e32664e09f06668f6e6250ea3b3abf7.zip
opensim-SC-ddff7ab20e32664e09f06668f6e6250ea3b3abf7.tar.gz
opensim-SC-ddff7ab20e32664e09f06668f6e6250ea3b3abf7.tar.bz2
opensim-SC-ddff7ab20e32664e09f06668f6e6250ea3b3abf7.tar.xz
* Add direct stream loading and saving methods to the archive module.
* The async stream method does not yet signal completion to interested calling code
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index a9ee88a..2b6d08d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -24,6 +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
27using System; 28using System;
28using System.Collections; 29using System.Collections;
29using System.Collections.Generic; 30using System.Collections.Generic;
@@ -116,9 +117,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
116 m_host = host; 117 m_host = host;
117 m_localID = localID; 118 m_localID = localID;
118 m_itemID = itemID; 119 m_itemID = itemID;
119 120
120
121
122 if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) 121 if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
123 m_OSFunctionsEnabled = true; 122 m_OSFunctionsEnabled = true;
124 123