diff options
| author | skolb <none@none> | 2009-12-03 14:33:38 -0800 | 
|---|---|---|
| committer | skolb <none@none> | 2009-12-03 14:33:38 -0800 | 
| commit | faa188322a72b86b6a167834a4d2cd664da112bc (patch) | |
| tree | d498ee9f8642cf17d0b4555b0ad02db42ec73bb2 /indra/viewer_components | |
| parent | ec34503e0193514ffbb1ccb1249013adb0a9e320 (diff) | |
| parent | 4535fd64fbee1ee0dd3bfe54c090cfa9c56a11b6 (diff) | |
Merge
Diffstat (limited to 'indra/viewer_components')
| -rw-r--r-- | indra/viewer_components/login/tests/lllogin_test.cpp | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp index 56c21016bd..6255f7ed15 100644 --- a/indra/viewer_components/login/tests/lllogin_test.cpp +++ b/indra/viewer_components/login/tests/lllogin_test.cpp @@ -231,6 +231,7 @@ namespace tut  		ensure_equals("Online state", listener.lastEvent()["state"].asString(), "online");  	} +	/*      template<> template<>      void llviewerlogin_object::test<2>()      { @@ -416,7 +417,8 @@ namespace tut  		ensure_equals("Failed to offline", listener.lastEvent()["state"].asString(), "offline");  	} -    template<> template<> + *FIX:Mani Disabled unit boost::coro is patched  +	template<> template<>      void llviewerlogin_object::test<5>()      {          DEBUG; @@ -451,4 +453,5 @@ namespace tut  		ensure_equals("SRV Failure", listener.lastEvent()["change"].asString(), "fail.login");   	} +*/  }  | 
