aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llstatusbar.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Rename hippo* files to lower case (PART 2 OF 2)Aleric Inglewood2010-11-051-1/+1
| | | | | | | | | | | 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.
* Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-221-2/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/GStreamer.cmake linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to use system libs, so any improvements that have been made in weekly have been invane. linden/indra/newview/llstartup.cpp Trivial #include collision. One include added another removed. Fixed. linden/indra/newview/lltoolpie.cpp Collision with RLV, pretty trivial. Fixed. linden/indra/newview/viewer_manifest.py Trivial White space fix collision with commenting out of gstreamer libs. Fixed.
| * Fixed #593: buy button overlaps currency when you become a millionaireMcCabe Maxsted2010-10-091-1/+1
| |
| * Applied RLVa-1.1.2-Imprudence.patch by Kitty BarnettMcCabe Maxsted2010-10-091-1/+5
| |
* | Merge branch 'mccabe-plugins' into plugins_mergeRobin Cornelius2010-10-101-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt linden/indra/cmake/GStreamer.cmake linden/indra/cmake/LLMedia.cmake linden/indra/cmake/OPENAL.cmake linden/indra/llmedia/CMakeLists.txt linden/indra/llprimitive/material_codes.h linden/indra/newview/chatbar_as_cmdline.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h linden/indra/newview/viewer_manifest.py linden/install.xml
| * llmediaplugins first stepArmin Weatherwax2010-09-231-1/+1
| |
* | Ported gSavedSettings changes from Emerald (as well as modifying a few of ours)McCabe Maxsted2010-09-251-3/+6
|/
* Added option in Preferences > General for setting the default time to 12 ↵McCabe Maxsted2010-07-301-122/+5
| | | | hour/24 hour/UTC. Side effects: moved crash logger settings to advanced prefs, fixed french date translations, past/future dates and times still need to be correctly formatted
* Fixed #339: status bar doesn't update buy currency button branding after ↵McCabe Maxsted2010-06-191-0/+8
| | | | switching grids
* fix: crash when sim crashes/disconnectsArmin Weatherwax2010-06-191-0/+3
|
* Added brandable buy currency button in the status bar (#273). Effectively ↵McCabe Maxsted2010-06-191-28/+16
| | | | reverts ad408085 and 2cb8d8b5
* Clicking the money balance now does nothing on non-SL grids.Jacek Antonelli2010-05-031-4/+15
| | | | | | So, it's totally inactive, not just the button hidden. TODO: Eventually it should actually check whether the grid supports buying currency.
* Hide the buy currency button in non-Second Life gridsMcCabe Maxsted2010-04-261-13/+28
|
* Ported currency changes from Hippo (#237) and fixed some labels Hippo missed ↵McCabe Maxsted2010-04-261-4/+4
| | | | (also fixed #200 in the process)
* Merged working branch of 1.2 into LL 1.23 mergeMcCabe Maxsted2009-10-181-0/+15
|\
| * Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.Jacek Antonelli2009-09-041-0/+15
| | | | | | | | Made a few non-functional changes to help it apply.
* | Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-301-22/+63
|/
* Second Life viewer sources 1.22.5-RCJacek Antonelli2009-01-111-1/+1
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-061-66/+67
|
* Second Life viewer sources 1.20.7Jacek Antonelli2008-08-151-14/+6
|
* Second Life viewer sources 1.20.2Jacek Antonelli2008-08-151-33/+22
|
* Second Life viewer sources 1.19.1.0Jacek Antonelli2008-08-151-18/+130
|
* Second Life viewer sources 1.19.0.3Jacek Antonelli2008-08-151-0/+2
|
* Second Life viewer sources 1.19.0.0Jacek Antonelli2008-08-151-35/+59
|
* Second Life viewer sources 1.18.6.4-RCJacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.18.6.0-RCJacek Antonelli2008-08-151-2/+2
|
* Second Life viewer sources 1.18.5.0-RCJacek Antonelli2008-08-151-59/+99
|
* Second Life viewer sources 1.18.4.0-RCJacek Antonelli2008-08-151-6/+9
|
* Second Life viewer sources 1.18.3.2-RCJacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.18.1.2Jacek Antonelli2008-08-151-49/+61
|
* Second Life viewer sources 1.17.3.0Jacek Antonelli2008-08-151-1/+84
|
* Second Life viewer sources 1.15.1.3Jacek Antonelli2008-08-151-0/+5
|
* Second Life viewer sources 1.15.0.2Jacek Antonelli2008-08-151-0/+1
|
* Second Life viewer sources 1.14.0.0Jacek Antonelli2008-08-151-3/+16
|
* Second Life viewer sources 1.13.2.12Jacek Antonelli2008-08-151-0/+631
generated by cgit v1.1 at 2025-01-13 23:20:48 +0000