aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Missed some is_linden -> is_god conversions.David Seikel2011-02-261-7/+7
|
* More meta-impy branding. Not so sure about the Mac and Windows stuff in ↵David Seikel2011-02-265-14/+14
| | | | this one.
* Unbranding word of the day is "Second Life".David Seikel2011-02-264-4/+4
|
* In the meta grid, staff members have the last name "Meta", the users are ↵David Seikel2011-02-252-5/+5
| | | | "metazens", and we abuse the age verification flag to let people choose to see Adult stuff.
* Unbranding. Todays word is "linden".David Seikel2011-02-2581-162/+160
|
* Merge branch 'weekly' into brandingDavid Seikel2011-02-2094-829/+2200
|\ | | | | | | | | | | | | Conflicts (solved): linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llappviewerwin32.cpp
| * Reduce the logging spam to warnings. Debug was too much.David Seikel2011-02-201-2/+2
| |
| * Merge remote-tracking branch 'mccabe/weekly' into weeklyDavid Seikel2011-02-2079-409/+2162
| |\
| | * Merge remote branch 'remotes/github/weekly' into weeklyMcCabe Maxsted2011-02-1814-32/+26
| | |\
| | | * Merge remote branch 'aleric/weekly' into weeklyMcCabe Maxsted2010-11-2311-17/+11
| | | |\
| | | | * IMP-590: Added a thread-safe and robust wrapper for APR pools.Aleric Inglewood2010-11-179-15/+8
| | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/590
| | | | * IMP-712: Add shortcut for the Groups tab.Aleric Inglewood2010-11-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bind control-shift-G to Groups. This is also done in snowglobe.
| | | | * IMP-577: Use the same string for FFSAVE_RAW as in strings.xmlAleric Inglewood2010-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently the code of Imprudence was from before this bug was introduced. Nevertheless, decided to add this one-liner so that the code becomes the same (in this regard) as snowglobe 1.x and (soon) viewer 2.x (see https://jira.secondlife.com/browse/STORM-423).
| | | * | Merge remote branch 'thickbrick/weekly' into weeklyMcCabe Maxsted2010-11-232-3/+6
| | | |\ \
| | | | * | Fix #724: Snap guides in scale manipulator not shown.thickbrick2010-11-201-1/+1
| | | | | |
| | | | * | Fix #705 (SNOW-717): Prevent mouse cursor flickerthickbrick2010-11-201-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Patch by Lance Corrimal taken from SNOW-717.
| | | * | | Merge remote branch 'armin/weekly' into weeklyMcCabe Maxsted2010-11-234-3/+24
| | | |\ \ \
| | | * | | | Fixed group list not updating when the group profile is changed (#644)McCabe Maxsted2010-11-231-0/+8
| | | | | | |
| | | * | | | Revert "Ported fix for Apply button not working correctly when changing show ↵McCabe Maxsted2010-11-231-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | group in profile option in the group window from Ascent Viewer" since it actually causes the bug it's supposed to fix This reverts commit 46bcc05dfd4a37c27a5db6146c5da1b632106c39.
| | * | | | | Give a little information in the log when we fail to init the audio plugin ↵McCabe Maxsted2011-02-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | on the first try
| | * | | | | Patch by Armin to split apart the 'Plugin' logcontrol.xml entry to avoid ↵McCabe Maxsted2011-02-102-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | spam when debugging plugins
| | * | | | | Use gstreamer plugin for windows audio mime typesMcCabe Maxsted2011-02-101-11/+11
| | | | | | |
| | * | | | | Updated windows version of boost to the 1.39 version used in Snowglobe 1.5. ↵McCabe Maxsted2011-02-101-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: only VS2005 libs currently included
| | * | | | | Enabled gstreamer10 media plugin in CMake for WindowsMcCabe Maxsted2011-02-101-12/+12
| | | | | | |
| | * | | | | Merge branch 'armin/weekly' into weeklyJacek Antonelli2011-02-0963-326/+2099
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | simple log rotateArmin Weatherwax2011-01-311-10/+29
| | | | | | |
| | | * | | | fix 2 regressions introduced by 76c8494525b8e2b1Armin Weatherwax2011-01-301-8/+21
| | | | | | |
| | | * | | | Beeks: Serious fix for the Tintable tattoos!Armin Weatherwax2011-01-291-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs moving the new avatar_lad.xml file from the Imprudence toplevel directory to linden/indra/newview/character/
| | | * | | | Update: Henri Beauchamp: Port of SG-2.0 alpha and tattoo layers v6->v9Armin Weatherwax2011-01-297-58/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | issue tattoo tinting does not work
| | | * | | | Add an UI for Display name settings to prefs general, make the setting more ↵Armin Weatherwax2011-01-2512-73/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intuitive instead: of 0 legacy only , 1 both and 2 display names only we use now: 0 legacy, 1 display names only and 2 both
| | | * | | | Henri Beauchamp: Display Names support v4Armin Weatherwax2011-01-2438-45/+1320
| | | | | | |
| | | * | | | re-enable statistics packet for SL, firstuse warn about itArmin Weatherwax2011-01-207-21/+122
| | | | | | |
| | | * | | | fix crash when linking objects using rubberband selection.Armin Weatherwax2011-01-041-1/+3
| | | | | | |
| | | * | | | delete gAudioStream at shutdown.Armin Weatherwax2011-01-041-3/+2
| | | | | | |
| | | * | | | move streaming audio out of gAudiop into its own class.Armin Weatherwax2011-01-0412-98/+315
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * might solve several issues with streaming audio, like: streaming audio not working when the sound effects driver fails. * breaks fmod. Sorry. If you want fmod go fix it, its probably not difficult.
| | | * | | | load unloaded-avatar-cloud particle system from LLSD file.Armin Weatherwax2010-12-226-29/+130
| | | |/ / /
| | | * | | fix: Bug #721: Search lagsArmin Weatherwax2010-11-194-3/+24
| | | | |/ | | | |/|
| * | | | Work around the endless bitching about webkit failing when you open the ↵David Seikel2011-02-111-2/+2
| | | | | | | | | | | | | | | | | | | | search window. At least now you can close search, THEN deal with the error popups.
| * | | | Remove special handling of linden estates. We don't have them in meta, and ↵David Seikel2011-02-1015-415/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that sort of policy should be server side anyway. It's good to remove useless code. As usual I found three ways of recognising linden estates being used in the code, makes it hard to find them all. Might be some left over.
| * | | | The new height limit is not reflected in the max you can enter in the map TP ↵David Seikel2011-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | location. This is an unimplimented feature for Imprudence, as they update the max Z position for prims. Since we don't actually provide these sorts of things from the sims, I'm just gonna hard code it for now.
* | | | | Remove catering to LL's probably illegal attempt to block copying of open ↵David Seikel2011-02-131-5/+12
| | | | | | | | | | | | | | | | | | | | source content that specifically prevents attempts to block copying.
* | | | | Changing some "Second Life" references to "meta-impy".David Seikel2011-02-131-5/+5
| | | | |
* | | | | UNBRANDING! Conservativley remove references to "second life", replacing ↵David Seikel2011-02-1317-27/+27
| | | | | | | | | | | | | | | | | | | | them with something generic.
* | | | | Revert "Comment out the server tellinsg us what the search URL is, seems the ↵David Seikel2011-02-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server sends garbage." This reverts commit c7f818d42ec4e2a2b8b27bfd4dbfaf4fc8beb7eb. The server is now fixed.
* | | | | Comment out the server tellinsg us what the search URL is, seems the server ↵David Seikel2011-02-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sends garbage. Should revert this when the server is fixed. Also explains why some viewers don't have working search.
* | | | | Make most of search work.David Seikel2011-02-111-0/+2
| | | | |
* | | | | Seems we need to hard code the meta7 tag colours. Also did the Imprudence ↵David Seikel2011-02-091-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | colours, coz dark purple on black is just unreadable. Invented a tag for meta-impy to.
* | | | | Update meta7 login details, and add the beta grid.David Seikel2011-02-091-6/+19
| | | | |
* | | | | Change imprudence -> meta-impy, though not the URLs. Probably some will ↵David Seikel2011-02-0932-199/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | need to be reverted later. Changed file names to.
* | | | | Artwork and font files in the repo now.David Seikel2011-02-082126-1/+25760
| | | | | | | | | | | | | | | | | | | | | | | | | My policy is to have it all in the repo. None of this downloading pre built stuff from people with no guarantee that they will still have the files a month from now. Been burnt with that before.