Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer into animesh

Browse Source
This commit is contained in:
Damian Zhaoying
2019-03-31 02:29:06 -03:00
parent 1644ee6fad c8a9efe5c8
commit 9b29fd1385
4 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llslurl.cpp
View File

@@ -61,8 +61,8 @@ const std::string MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/
const std::string SYSTEM_GRID_APP_SLURL_BASE = "secondlife:///app";
const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/";
const char* DEFAULT_SLURL_BASE = "https://%s/region/";
const char* DEFAULT_APP_SLURL_BASE = "x-grid-location-info://%s/app";
const char* DEFAULT_SLURL_BASE = "x-grid-info://%s/region/";
const char* DEFAULT_APP_SLURL_BASE = "x-grid-info://%s/app";
#define MAINGRID "secondlife"
// resolve a simstring from a slurl