diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-20 00:02:26 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-20 00:02:26 -0700 |
| commit | d4b37309cb00108a761259d570ae9057658ad215 (patch) | |
| tree | fbbb266098f9201b7af9debb5cc67da7601604c5 /indra/newview/llslurl.h | |
| parent | da09b1dde1e09cd5c43114321479da3b22df1355 (diff) | |
EXT-6734 - Unable to run several copies of viewer
On startup, a piece of code in llappviewer.cpp checks for the existence
and validity of a slurl entered on the command line. If there is a slurl,
then the slurl is sent to another instance of the viewer if one is running
(for windows and linux only.)
After the SLE refactor of slurls, the startup slurl was set to LAST
by default. As this is a valid slurl the call to pass the slurl to another
viewer was made, ignoring the codepath that checks for multiple viewer
launches.
The fix defaults the startup slurl to INVALID. Now, when no slurl is passed
in on the command line, the code that sends the slurl to another instance is
skipped and the 'multiple' flag is checked appropriately.
Diffstat (limited to 'indra/newview/llslurl.h')
| -rw-r--r-- | indra/newview/llslurl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llslurl.h b/indra/newview/llslurl.h index 28c23561cf..1210c398f1 100644 --- a/indra/newview/llslurl.h +++ b/indra/newview/llslurl.h @@ -65,7 +65,7 @@ public: }; - LLSLURL(): mType(LAST_LOCATION) { } + LLSLURL(): mType(INVALID) { } LLSLURL(const std::string& slurl); LLSLURL(const std::string& grid, const std::string& region); LLSLURL(const std::string& region, const LLVector3& position); |