diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-08-18 17:11:08 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-08-18 17:11:08 -0400 |
| commit | 78c71eba60b7eb6de0a6e277c390f6586cfb0cf6 (patch) | |
| tree | 98f00d83c842653b46207907ddd6c069479a29b5 /indra/llui/tests | |
| parent | 05d90b56797221ef8d52099722c467a9422c7ce6 (diff) | |
| parent | 62527e6f18f0a035a234cf584e31f7eea93fd4a7 (diff) | |
Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u
Diffstat (limited to 'indra/llui/tests')
| -rwxr-xr-x | indra/llui/tests/llurlentry_stub.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp index 5d3f9ac327..f01178c374 100755 --- a/indra/llui/tests/llurlentry_stub.cpp +++ b/indra/llui/tests/llurlentry_stub.cpp @@ -165,8 +165,6 @@ LLFontGL* LLFontGL::getFontDefault() char const* const _PREHASH_AgentData = (char *)"AgentData"; char const* const _PREHASH_AgentID = (char *)"AgentID"; -LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS); - LLMessageSystem* gMessageSystem = NULL; // |