diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-05-20 12:59:59 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-05-20 12:59:59 -0700 |
| commit | 3a212d9608492ae64a3a32f80790371b90be9e9e (patch) | |
| tree | fcb3901b838af753e40c2ddd1ce84b95a6c2f603 /indra/newview/llslurl.cpp | |
| parent | c7461061b8113fa258611b1a31f16a119fad1a2c (diff) | |
| parent | e1623bb276f83a43ce7a197e388720c05bdefe61 (diff) | |
Merge branch 'spaces-merge' into roxie/webrtc-voice
Diffstat (limited to 'indra/newview/llslurl.cpp')
| -rw-r--r-- | indra/newview/llslurl.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp index e43fb993ce..432ec3899a 100644 --- a/indra/newview/llslurl.cpp +++ b/indra/newview/llslurl.cpp @@ -34,17 +34,17 @@ #include "llviewernetwork.h" #include "llfiltersd2xmlrpc.h" #include "curl/curl.h" -const char* LLSLURL::SLURL_HTTP_SCHEME = "http"; -const char* LLSLURL::SLURL_HTTPS_SCHEME = "https"; +const char* LLSLURL::SLURL_HTTP_SCHEME = "http"; +const char* LLSLURL::SLURL_HTTPS_SCHEME = "https"; const char* LLSLURL::SLURL_SECONDLIFE_SCHEME = "secondlife"; -const char* LLSLURL::SLURL_SECONDLIFE_PATH = "secondlife"; -const char* LLSLURL::SLURL_COM = "slurl.com"; +const char* LLSLURL::SLURL_SECONDLIFE_PATH = "secondlife"; +const char* LLSLURL::SLURL_COM = "slurl.com"; // For DnD - even though www.slurl.com redirects to slurl.com in a browser, you can copy and drag // text with www.slurl.com or a link explicitly pointing at www.slurl.com so testing for this // version is required also. -const char* LLSLURL::WWW_SLURL_COM = "www.slurl.com"; -const char* LLSLURL::MAPS_SECONDLIFE_COM = "maps.secondlife.com"; +const char* LLSLURL::WWW_SLURL_COM = "www.slurl.com"; +const char* LLSLURL::MAPS_SECONDLIFE_COM = "maps.secondlife.com"; const char* LLSLURL::SLURL_X_GRID_LOCATION_INFO_SCHEME = "x-grid-location-info"; const char* LLSLURL::SLURL_APP_PATH = "app"; const char* LLSLURL::SLURL_REGION_PATH = "region"; |