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

Fix a shutdown crash (Crash B)

Browse Source
This commit is contained in:
Liru Færs
2020-01-04 19:46:17 -05:00
parent 2f24a53a01
commit 5daf4aa777
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llpanellogin.cpp
View File

@@ -266,8 +266,8 @@ LLPanelLogin::LLPanelLogin(const LLRect& rect)
location_combo->setFocusLostCallback( boost::bind(&LLPanelLogin::onLocationSLURL, this) ); location_combo->setFocusLostCallback( boost::bind(&LLPanelLogin::onLocationSLURL, this) );
LLComboBox* server_choice_combo = getChild<LLComboBox>("grids_combo"); LLComboBox* server_choice_combo = getChild<LLComboBox>("grids_combo");
server_choice_combo->setCommitCallback(boost::bind(&LLPanelLogin::onSelectGrid, _1)); server_choice_combo->setCommitCallback(boost::bind(&LLPanelLogin::onSelectGrid, this, _1));
server_choice_combo->setFocusLostCallback(boost::bind(&LLPanelLogin::onSelectGrid, server_choice_combo)); server_choice_combo->setFocusLostCallback(boost::bind(&LLPanelLogin::onSelectGrid, this, server_choice_combo));
// Load all of the grids, sorted, and then add a bar and the current grid at the top // Load all of the grids, sorted, and then add a bar and the current grid at the top
updateGridCombo(); updateGridCombo();
@@ -1111,7 +1111,7 @@ void LLPanelLogin::onSelectGrid(LLUICtrl *ctrl)
} }
gHippoGridManager->setCurrentGrid(grid); gHippoGridManager->setCurrentGrid(grid);
ctrl->setValue(grid); ctrl->setValue(grid);
sInstance->addFavoritesToStartLocation(); addFavoritesToStartLocation();
/* /*
* Determine whether or not the value in the start_location_combo makes sense * Determine whether or not the value in the start_location_combo makes sense
@@ -1123,7 +1123,7 @@ void LLPanelLogin::onSelectGrid(LLUICtrl *ctrl)
* https://grid.example.com/region/Party%20Town/20/30/5 specify a particular * https://grid.example.com/region/Party%20Town/20/30/5 specify a particular
* grid; in those cases we want to clear the location. * grid; in those cases we want to clear the location.
*/ */
auto location_combo = sInstance->getChild<LLComboBox>("start_location_combo"); auto location_combo = getChild<LLComboBox>("start_location_combo");
S32 index = location_combo->getCurrentIndex(); S32 index = location_combo->getCurrentIndex();
switch (index) switch (index)
{ {

2
indra/newview/llpanellogin.h
View File

@@ -114,7 +114,7 @@ private:
static void onClickNewAccount(); static void onClickNewAccount();
static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response); static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response);
static void onClickGrids(); static void onClickGrids();
static void onSelectGrid(LLUICtrl *ctrl); void onSelectGrid(LLUICtrl *ctrl);
static void onClickForgotPassword(); static void onClickForgotPassword();
static void onPassKey(); static void onPassKey();
static void onSelectLoginEntry(const LLSD& selected_entry); static void onSelectLoginEntry(const LLSD& selected_entry);