diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-06 10:19:31 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-06 10:19:31 -0400 |
| commit | ec5bd9c857b4d817685b09f9a10da7434ebbb816 (patch) | |
| tree | b6400432fea054747130c183447599ced6709e5d /indra/newview/tests | |
| parent | 785d4c34b62b7ca76b292e0001c516ba8fa738bc (diff) | |
| parent | 7187f08e89ca1d10fb872070dc6381a0a926f57d (diff) | |
automated merge
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/llviewernetwork_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp index f9f42cfc86..e0c7c83f4b 100644 --- a/indra/newview/tests/llviewernetwork_test.cpp +++ b/indra/newview/tests/llviewernetwork_test.cpp @@ -216,10 +216,10 @@ namespace tut #ifndef LL_RELEASE_FOR_DOWNLOAD ensure_equals("Agni grid label was not modified by grid file", grid[GRID_LABEL_VALUE].asString(), std::string("Agni")); -#else \\ LL_RELEASE_FOR_DOWNLOAD +#else // LL_RELEASE_FOR_DOWNLOAD ensure_equals("Agni grid label was not modified by grid file", grid[GRID_LABEL_VALUE].asString(), std::string("Secondlife.com")); -#endif \\ LL_RELEASE_FOR_DOWNLOAD +#endif // LL_RELEASE_FOR_DOWNLOAD ensure_equals("Agni name wasn't modified by grid file", grid[GRID_VALUE].asString(), std::string("util.agni.lindenlab.com")); |