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

Revert "some stuff"

Browse Source 
This reverts commit 5d993e35c4.
This commit is contained in:
Hazim Gazov
2010-08-01 04:54:14 +00:00
parent 5d993e35c4
commit 62c1bd007f
4 changed files with 59 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llsavedlogins.cpp
View File

@@ -57,14 +57,6 @@ LLSavedLoginEntry::LLSavedLoginEntry(const LLSD& entry_data)
{
throw std::invalid_argument("Missing grid key.");
}
if (!entry_data.has("macaddress"))
{
throw std::invalid_argument("Missing MAC address.");
}
if (!entry_data.has("volumeid"))
{
throw std::invalid_argument("Missing volume ID.");
}
if (!entry_data.has("password"))
{
throw std::invalid_argument("Missing password key.");
@@ -88,9 +80,10 @@ LLSavedLoginEntry::LLSavedLoginEntry(const LLSD& entry_data)
mEntry = entry_data;
}
LLSavedLoginEntry(const EGridInfo gridinfo, const std::string& firstname,
const std::string& lastname, const std::string& password,
const std::string& macaddress, const std::string& volumeid)
LLSavedLoginEntry::LLSavedLoginEntry(const EGridInfo grid,
const std::string& firstname,
const std::string& lastname,
const std::string& password)
{
mEntry.clear();
mEntry.insert("grid", LLSD(grid));