diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
commit | 6be2f0ba2b672fc37cd6d4e8adf62ae71bf8c842 (patch) | |
tree | 86740538c9c2a2ff1359cf96db2521d99c8aebe7 /indra/newview/llworldmapview.cpp | |
parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
parent | 316e35ad2a735784cfc309ea9fd74d2d9d1f985a (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
-rwxr-xr-x | indra/newview/llworldmapview.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index 7cb53a0706..2ebefbdb11 100755 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -67,7 +67,6 @@ const F32 OCEAN_GREEN = (F32)(0x47)/255.f; const F32 OCEAN_BLUE = (F32)(0x5F)/255.f; const F32 GODLY_TELEPORT_HEIGHT = 200.f; -const S32 SCROLL_HINT_WIDTH = 65; const F32 BIG_DOT_RADIUS = 5.f; BOOL LLWorldMapView::sHandledLastClick = FALSE; |