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

some stuff

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

15
indra/newview/llsavedlogins.cpp
View File

@@ -57,6 +57,14 @@ 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.");
@@ -80,10 +88,9 @@ LLSavedLoginEntry::LLSavedLoginEntry(const LLSD& entry_data)
mEntry = entry_data;
}
LLSavedLoginEntry::LLSavedLoginEntry(const EGridInfo grid,
const std::string& firstname,
const std::string& lastname,
const std::string& password)
LLSavedLoginEntry(const EGridInfo gridinfo, const std::string& firstname,
const std::string& lastname, const std::string& password,
const std::string& macaddress, const std::string& volumeid)
{
mEntry.clear();
mEntry.insert("grid", LLSD(grid));