6 files changed, 29 insertions, 12 deletions

diff --git a/linden/indra/test/inventory.cpp b/linden/indra/test/inventory.cpp
index 3899dfc..a4a4599 100644
--- a/linden/indra/test/inventory.cpp
+++ b/linden/indra/test/inventory.cpp
@@ -329,7 +329,7 @@ namespace tut
         template<> template<>
         void inventory_object::test<7>()
         {
-                FILE* fp = fopen("linden_file.dat","w+");
+                LLFILE* fp = LLFile::fopen("linden_file.dat","w+");
                 if(!fp)
                 {
                         llerrs << "file could not be opened\n" << llendl;
@@ -341,7 +341,7 @@ namespace tut
                 fclose(fp);
 
                 LLPointer<LLInventoryItem> src2 = new LLInventoryItem();        
-                fp = fopen("linden_file.dat","r+");
+                fp = LLFile::fopen("linden_file.dat","r+");
                 if(!fp)
                 {
                         llerrs << "file could not be opened\n" << llendl;
@@ -483,7 +483,7 @@ namespace tut
         template<> template<>
         void inventory_object::test<13>()
         {
-                FILE* fp = fopen("linden_file.dat","w");
+                LLFILE* fp = LLFile::fopen("linden_file.dat","w");
                 if(!fp)
                 {
                         llerrs << "file coudnt be opened\n" << llendl;
@@ -495,7 +495,7 @@ namespace tut
                 fclose(fp);
 
                 LLPointer<LLInventoryCategory> src2 = new LLInventoryCategory();        
-                fp = fopen("linden_file.dat","r");
+                fp = LLFile::fopen("linden_file.dat","r");
                 if(!fp)
         {
                         llerrs << "file coudnt be opened\n" << llendl;
diff --git a/linden/indra/test/llblowfish_tut.cpp b/linden/indra/test/llblowfish_tut.cpp
index e1fa2fd..78253cd 100644
--- a/linden/indra/test/llblowfish_tut.cpp
+++ b/linden/indra/test/llblowfish_tut.cpp
@@ -60,13 +60,13 @@ namespace tut
                 bool matchFile(const char* filename,
                                 const std::string& data)
                 {
-                        FILE* fp = fopen(filename, "rb");
+                        LLFILE* fp = LLFile::fopen(filename, "rb");
                         if (!fp) 
                         {
                                 // sometimes test is run inside the indra directory
                                 std::string path = "test/";
                                 path += filename;
-                                fp = fopen(path.c_str(), "rb");
+                                fp = LLFile::fopen(path.c_str(), "rb");
                         }
                         if (!fp)
                         {
diff --git a/linden/indra/test/lldatapacker_tut.cpp b/linden/indra/test/lldatapacker_tut.cpp
index 096801a..d561a3c 100644
--- a/linden/indra/test/lldatapacker_tut.cpp
+++ b/linden/indra/test/lldatapacker_tut.cpp
@@ -351,7 +351,7 @@ namespace tut
         {
                 F32 f_val = 44.44f, f_unpkval;
 
-                FILE* fp = fopen(TEST_FILE_NAME, "w+");
+                LLFILE* fp = LLFile::fopen(TEST_FILE_NAME, "w+");
                 if(!fp)
                 {
                         llerrs << "File couldnt be open" <<llendl;
@@ -406,7 +406,7 @@ namespace tut
                 LLVector4 unpkllvec4;
                 LLUUID unpkuuid;
 
-                FILE* fp = fopen(TEST_FILE_NAME,"w+");
+                LLFILE* fp = LLFile::fopen(TEST_FILE_NAME,"w+");
                 if(!fp)
                 {
                         llerrs << "File couldnt be open" <<llendl;
diff --git a/linden/indra/test/llmessageconfig_tut.cpp b/linden/indra/test/llmessageconfig_tut.cpp
index e5dd328..869070e 100644
--- a/linden/indra/test/llmessageconfig_tut.cpp
+++ b/linden/indra/test/llmessageconfig_tut.cpp
@@ -221,4 +221,21 @@ namespace tut
                                           LLMessageConfig::onlySendLatest("msg2"),
                                           false);
         }
+
+        template<> template<>
+        void LLMessageConfigTestObject::test<9>()
+                 // tests that event queue max is reloaded
+        {
+                LLSD config;
+                config["maxQueuedEvents"] = 200;
+                LLMessageConfig::useConfig(config);
+                ensure_equals("Ensure setting maxQueuedEvents",
+                                          LLMessageConfig::getMaxQueuedEvents(),
+                                          200);
+
+                LLMessageConfig::useConfig(LLSD());
+                ensure_equals("Ensure default of event queue max 100",
+                                          LLMessageConfig::getMaxQueuedEvents(),
+                                          100);
+        }        
 }
diff --git a/linden/indra/test/llpermissions_tut.cpp b/linden/indra/test/llpermissions_tut.cpp
index 25af11c..0f53b98 100644
--- a/linden/indra/test/llpermissions_tut.cpp
+++ b/linden/indra/test/llpermissions_tut.cpp
@@ -421,7 +421,7 @@ namespace tut
         template<> template<>
         void permission_object_t::test<20>()
         {
-                FILE* fp = fopen("linden_file.dat","w+");
+                LLFILE* fp = LLFile::fopen("linden_file.dat","w+");
                 if(!fp)
                 {
                         llerrs << "file coudnt be opened\n" << llendl;
@@ -444,7 +444,7 @@ namespace tut
 
                 perm.exportFile(fp);
                 fclose(fp);     
-                fp = fopen("linden_file.dat","r+");
+                fp = LLFile::fopen("linden_file.dat","r+");
                 if(!fp)
                 {
                         llerrs << "file coudnt be opened\n" << llendl;
diff --git a/linden/indra/test/llsaleinfo_tut.cpp b/linden/indra/test/llsaleinfo_tut.cpp
index dde0d6e..297a19b 100644
--- a/linden/indra/test/llsaleinfo_tut.cpp
+++ b/linden/indra/test/llsaleinfo_tut.cpp
@@ -113,7 +113,7 @@ namespace tut
         void llsaleinfo_test_t::test<2>()
         {
 
-                FILE* fp = fopen("linden_file.dat","w+");
+                LLFILE* fp = LLFile::fopen("linden_file.dat","w+");
                 if(!fp)
                 {
                         llerrs << "file could not be opened\n" << llendl;
@@ -129,7 +129,7 @@ namespace tut
                 LLSaleInfo llsaleinfo1;
                 U32 perm_mask;
                 BOOL has_perm_mask;
-                fp = fopen("linden_file.dat","r");
+                fp = LLFile::fopen("linden_file.dat","r");
                 
                 if(!fp)
                 {