aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/hippogridmanager.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Update the grid manager to load grids from our meta7 server. Set the ↵David Seikel2011-05-021-3/+0
| | | | | | | | default grid to meta7." This reverts commit 92d51b498d83e7ab917d53a47b566707adc088bf. We are no longer a meta 7 specific viewer.
* Merge remote-tracking branch 'imprudence/exp' into expDavid Seikel2011-04-261-257/+222
|\ | | | | | | | | | | | | | | | | | | Conflicts (for future reference): linden/indra/llcommon/llstring.cpp linden/indra/newview/llpanelnetwork.cpp linden/indra/newview/llselectmgr.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/lltoolmgr.cpp linden/indra/newview/llvoavatar.cpp
| * Remember name and password based on grid. This is far from optimal, but will ↵McCabe Maxsted2011-04-191-3/+93
| | | | | | | | | | | | | | | | | | | | | | work for the time being. * UI needs to be made clear on what's going on with user's passwords * 'Remember password' checkbox now works on login (but is unclear) * Stored passwords are MD5s in grid_info.xml * Fixed vivox license appearing on other grids rather than specifically on second life login when voice is enabled * Small fix for username entry after logout * Sadly, storing password in the mac keychain needs to be reimplemented now
| * Updated the grid manager to save names and passwords along with grid info. ↵McCabe Maxsted2011-04-151-256/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit includes the following: * Fixed missing GPL headers from hippo grid manager * Fixed grids named <required> or "" being saved in the list * Fixed grid manager list only showing grid nicks, not grid names * Fixed grid names not settable in the grid manager * Grid manager now remembers avatar names and passwords * Usernames can now be set in the grid manager for SL (needs work) * Fixed grid manager being stuck in an updating state * Some general code cleanup
* | Merge remote-tracking branch 'jacek/exp' into expDavid Seikel2011-04-031-1/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/llpanellogin.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/install.xml Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
| * Merge remote-tracking branch 'armin/exp' into expMcCabe Maxsted2011-03-241-1/+11
| |\
| | * Don't try to fetch grid list from empty url in GridUpdateListArmin Weatherwax2011-03-221-1/+11
| | |
| * | Support username logins on Linden grids. Seems to cover most edge cases with ↵McCabe Maxsted2011-03-221-0/+7
| |/ | | | | | | our current grid manager, but really exposes the weaknesses of not saving login info with the grid, usability-wise. (Note: autologin and the command line need to be tested)
* | Update the grid manager to load grids from our meta7 server. Set the default ↵David Seikel2011-01-181-0/+3
|/ | | | | | | | grid to meta7. Prevent setting the default grid to anything but meta7 (except by editing the settings file). By Tom Meta from his fork. See the TomsOldWork branch.
* Rename hippo* files to lower case (PART 2 OF 2)Aleric Inglewood2010-11-051-2/+2
| | | | | | | | | | | There was a problem with #include "hippolimits.h" because the file is called hippoLimits.h (with an uppercase L). After some discussion on IRC it was reluctantly decided that filenames should be lowercase, as is done for every Linden file. This is part 2 or 2 (the first part just renamed the files). This part changes all files to make the viewer compile again after the renaming.
* Rename hippo* files to lower case (PART 1 OF 2)Aleric Inglewood2010-11-051-0/+970
There was a problem with #include "hippolimits.h" because the file is called hippoLimits.h (with an uppercase L). After some discussion on IRC it was reluctantly decided that filenames should be lowercase, as is done for every Linden file. Moreover, hippolimits.h is about the class HippoLimits, with uppercase H, so even that doesn't match. Of course, then we immediately rename all hippo* files to lowercase. This patch ONLY renames the file, with no other changes. This is done in order to make sure that git won't get confused ;). All other necessary changes will be in the next commit.