diff options
| author | Richard Linden <none@none> | 2011-04-06 15:15:33 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-06 15:15:33 -0700 |
| commit | 75ddf612ad29240d6d34b5044ae09e4295217766 (patch) | |
| tree | 70eeb78247ef3ae779809485afaaf592aa495b34 /indra/llui | |
| parent | 4dd471d055bea672f5eb21cfcc4d07e6b3ba3f9b (diff) | |
| parent | 80efbeead1d59b64b615f8a33cb0966cf7fef9f1 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/tests/llurlentry_stub.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp index 966bea329c..ac2412c928 100644 --- a/indra/llui/tests/llurlentry_stub.cpp +++ b/indra/llui/tests/llurlentry_stub.cpp @@ -193,8 +193,8 @@ LLFontGL* LLFontGL::getFontDefault() return NULL; } -char* _PREHASH_AgentData = (char *)"AgentData"; -char* _PREHASH_AgentID = (char *)"AgentID"; +char const* const _PREHASH_AgentData = (char *)"AgentData"; +char const* const _PREHASH_AgentID = (char *)"AgentID"; LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS); |