livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Firestorm LGPL

meow-7.2.2
Ansariel 2017-10-05 16:20:21 +02:00
parent 5cf744cbcb 8066bd5f1f
commit bb19fb9273
5 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/app_settings/settings.xml
View File

@ -1760,13 +1760,13 @@
</map>
<key>AssetFetchConcurrency</key>
<map>
<key>Comment</key>
<string>Maximum number of HTTP connections used for asset fetches</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<key>Comment</key>
<string>Maximum number of HTTP connections used for asset fetches</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AuctionShowFence</key>

13
indra/newview/fspanellogin.cpp
View File

@ -82,6 +82,7 @@ const S32 MAX_PASSWORD_OPENSIM = 255;
FSPanelLogin *FSPanelLogin::sInstance = NULL;
BOOL FSPanelLogin::sCapslockDidNotification = FALSE;
BOOL FSPanelLogin::sCredentialSet = FALSE;
std::string FSPanelLogin::sPassword = "";
// Helper for converting a user name into the canonical "Firstname Lastname" form.
@ -187,6 +188,7 @@ FSPanelLogin::FSPanelLogin(const LLRect &rect,
setBackgroundOpaque(TRUE);
mPasswordModified = FALSE;
FSPanelLogin::sInstance = this;
LLView* login_holder = gViewerWindow->getLoginPanelHolder();
@ -463,6 +465,7 @@ void FSPanelLogin::setFields(LLPointer<LLCredential> credential, bool from_start
LL_WARNS() << "Attempted setFields with no login view shown" << LL_ENDL;
return;
}
sCredentialSet = TRUE;
LL_INFOS("Credentials") << "Setting login fields to " << *credential << LL_ENDL;
std::string login_id;
@ -727,9 +730,12 @@ void FSPanelLogin::onUpdateStartSLURL(const LLSLURL& new_start_slurl)
updateServer(); // to change the links and splash screen
}
location_combo->setTextEntry(new_start_slurl.getLocationString());
sInstance->mLocationLength = new_start_slurl.getLocationString().length();
sInstance->updateLoginButtons();
if ( new_start_slurl.getLocationString().length() )
{
location_combo->setTextEntry(new_start_slurl.getLocationString());
sInstance->mLocationLength = new_start_slurl.getLocationString().length();
sInstance->updateLoginButtons();
}
}
else
{
@ -908,6 +914,7 @@ void FSPanelLogin::onClickConnect(void *)
}
else
{
sCredentialSet = FALSE;
LLPointer<LLCredential> cred;
BOOL remember;
getFields(cred, remember);

4
indra/newview/fspanellogin.h
View File

@ -58,6 +58,8 @@ public:
static void getFields(LLPointer<LLCredential>& credential, BOOL& remember);
static BOOL isCredentialSet() { return sCredentialSet; }
static BOOL areCredentialFieldsDirty();
static void setLocation(const LLSLURL& slurl);
static void autologinToLocation(const LLSLURL& slurl);
@ -122,6 +124,8 @@ private:
static FSPanelLogin* sInstance;
static BOOL sCapslockDidNotification;
static BOOL sCredentialSet;
unsigned int mUsernameLength;
unsigned int mPasswordLength;
unsigned int mLocationLength;

11
indra/newview/llstartup.cpp
View File

@ -1132,13 +1132,16 @@ bool idle_startup()
// Show the login dialog
login_show();
// connect dialog is already shown, so fill in the names
if (gUserCredential.notNull())
// <FS:CR>
//if (gUserCredential.notNull() && !LLPanelLogin::isCredentialSet())
//{
// LLPanelLogin::setFields( gUserCredential, gRememberPassword);
//}
if (gUserCredential.notNull() && !FSPanelLogin::isCredentialSet())
{
// <FS:CR>
//LLPanelLogin::setFields( gUserCredential, gRememberPassword);
FSPanelLogin::setFields(gUserCredential, true);
// </FS:CR>
}
// </FS:CR>
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::giveFocus();
FSPanelLogin::giveFocus();

2
indra/newview/skins/default/xui/en/floater_linkreplace.xml
View File

@ -3,7 +3,7 @@
name="linkreplace"
help_topic="linkreplace"
positioning="centered"
title="REPLACE INVENTORY LINKS"
title="Replace Inventory Links"
width="333"
height="130"
save_rect="true"