Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'next' of git://github.com/mccabe/imprudence into next | David Seikel | 2011-06-25 | 2 | -111/+199 |
|\ | |||||
| * | Fixed the word 'beta' missing from the imp installer | McCabe Maxsted | 2011-06-21 | 1 | -2/+2 |
| | | |||||
| * | Update the Windows installers for the upcoming 1.4 beta | McCabe Maxsted | 2011-06-21 | 2 | -111/+199 |
| | | |||||
* | | Merge branch 'next' of git://github.com/jacek/imprudence into next | David Seikel | 2011-06-25 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fixed viewer version number (1.4.0, not 1.4.1). | Jacek Antonelli | 2011-06-20 | 1 | -1/+1 |
| | | |||||
* | | Clean up the tag colour stuff after the merge. | David Seikel | 2011-06-19 | 1 | -18/+15 |
| | | | | | | | | Also putting our own at the top of the if tree, and the meta7 one lower. | ||||
* | | Merge branch 'next' of git://github.com/jacek/imprudence into next | David Seikel | 2011-06-19 | 10 | -114/+19 |
|\ \ | |/ | | | | | | | | | | | Conflicts (manually merged the grids, ignored the other two): linden/indra/newview/app_settings/default_grids.xml linden/indra/newview/llvoavatar.cpp linden/indra/newview/skins/default/xui/en-us/panel_login.xml | ||||
| * | Clarified the terms for activating spellchecking dictionaries. | Jacek Antonelli | 2011-06-17 | 1 | -5/+5 |
| | | | | | | | | | | The UI for selecting dictionaries needs a fundamental revamp, but this clarification should at least reduce some user confusion. | ||||
| * | Fixed DicDownloadBaseURL to use http://app.kokuaviewer.org. | Jacek Antonelli | 2011-06-16 | 1 | -1/+1 |
| | | |||||
| * | Removed Meta7 and WorldSimTerra from default_grids.xml. | Jacek Antonelli | 2011-06-15 | 1 | -31/+1 |
| | | | | | | | | Meta7 is definitely gone, WorldSimTerra seems to be, too. | ||||
| * | Fixed a nonfunctional help button in the Region/Estate window. | Jacek Antonelli | 2011-06-15 | 1 | -2/+1 |
| | | | | | | | | | | The help button for Minimum Agent Age was being initialized in the code for the Debug tab, when it's actually in the Region tab. | ||||
| * | Removed Aurora Grid from the default grid list. | Jacek Antonelli | 2011-06-15 | 1 | -15/+0 |
| | | | | | | | | It's only a testing/development grid, not intended for real use. | ||||
| * | Added "Show client name tag colors" checkbox in Preferences > Advanced. | Jacek Antonelli | 2011-06-15 | 2 | -4/+9 |
| | | | | | | | | | | That checkbox was removed from Preferences > Colors in the previous commit (87219855). | ||||
| * | Reverted ability to customize the Imprudence client tag color. | Jacek Antonelli | 2011-06-14 | 5 | -256/+182 |
| | | | | | | | | | | | | | | | | | | The Imprudence tag color is part of our official branding. Users can turn it off, but the color itself is not a matter of user preference. This reverts commits e7ab172b762bbbb87ca78889fdaecfda39a71233 and c903ce543fecedd53d07f2d0fa7f6b149b2b8a1, and removes two widgets from Preferences > Colors. | ||||
| * | Merge remote-tracking branch 'thickbrick/misc' into next | Jacek Antonelli | 2011-06-14 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix #924: default RunMultipleThreads to TRUE. | thickbrick | 2011-06-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | This should work around the 5% FPS slowdown caused by #614 and is generally a good idea (unless it causes problems, in which case it's definetely a bad idea). | ||||
| * | | Rearranged the login panel to put the grid selector on the left. | Jacek Antonelli | 2011-06-14 | 1 | -29/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | The choice of grid affects the name and password fields, so the grid selector should be on the left, so that users will interact with it first. If it were on the right, users would often interact with it *after* typing in their name and password, which would cause the name and password fields to be reset, frustrating the user. | ||||
| * | | Commented out "Cut" from menu_inventory.xml. See IMP-961. | Jacek Antonelli | 2011-06-12 | 1 | -0/+2 |
| | | | |||||
* | | | Merge remote-tracking branch 'jacek/next' into next | David Seikel | 2011-06-12 | 44 | -1219/+2019 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (manualy merged): linden/indra/newview/app_settings/default_grids.xml linden/indra/newview/primbackup.cpp linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/indra/newview/skins/default/xui/en-us/notifications.xml InWorldz specific crap removed. | ||||
| * | | Updated app_settings/default_grids.xml from our online grid list. | Jacek Antonelli | 2011-06-11 | 1 | -15/+22 |
| | | | |||||
| * | | Use the name of the root node for the default export filename | McCabe Maxsted | 2011-06-11 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch '1.4-fbeta-maxselectfix' into 1.4-fbeta-export_texture_sl | McCabe Maxsted | 2011-06-11 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fixed file that wasn't committed in 231e9eee (missing this breaks prim creation) | McCabe Maxsted | 2011-06-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | Allow export of textures from Second Life when we have permission (also ↵ | McCabe Maxsted | 2011-06-10 | 5 | -673/+853 |
| | | | | | | | | | | | | | | | | clean up primbackup.cpp). Based on Henri Beauchamp's patch | ||||
| * | | | Added AO toolbar option to preferences > advanced | McCabe Maxsted | 2011-06-10 | 3 | -2/+19 |
| | | | | |||||
| * | | | Show tooltips on profile pick tabs (lousy workaround for most names being ↵ | McCabe Maxsted | 2011-06-10 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | too big too fit) | ||||
| * | | | Check for when a profile's born on date field gets sent invalid data | McCabe Maxsted | 2011-06-10 | 2 | -22/+33 |
| |/ / | |||||
| * | | Don't limit select distance when Disable Max Build Constraints is enabled | McCabe Maxsted | 2011-06-09 | 5 | -5/+5 |
| | | | | | | | | | | | | (cherry picked from commit c5ce8f27de70b81232aa8995dda80186eebe0247) | ||||
| * | | Removed debug setting MaxSelectDistance... | McCabe Maxsted | 2011-06-09 | 10 | -21/+25 |
| | | | | | | | | | | | | | | | | | | | | | ... in favor of setting the select distance differently between opensim and second life in the hippo limits (cherry picked from commit 2545b11e06538010bd5ddb46499920a43889ed0f) | ||||
| * | | Added copy group link button to create clickable links to groups in the viewer | McCabe Maxsted | 2011-06-09 | 5 | -2/+68 |
| | | | | | | | | | | | | (cherry picked from commit 18464593de52a31fa098f5ee5e543d9a44f1889e) | ||||
| * | | Merge remote-tracking branch 'mccabe/1.4-fbeta-iwsupport' into next | Jacek Antonelli | 2011-06-09 | 1 | -1/+29 |
| |\ \ | |||||
| | * | | Parse and use inworldz-specific slurls as if they were regular slurls | McCabe Maxsted | 2011-06-08 | 1 | -1/+29 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'mccabe/1.4-fbeta-landmark_preview' into next | Jacek Antonelli | 2011-06-09 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fixed landmark inventory offers not opening when automatic preview is enabled | McCabe Maxsted | 2011-06-08 | 1 | -1/+1 |
| | |/ | |||||
| * | | Fixed inventory count being reset when the inventory window's closed/reopened | McCabe Maxsted | 2011-06-09 | 2 | -3/+6 |
| | | | |||||
| * | | Disable the AO sit toolbar button when the AO is disabled | McCabe Maxsted | 2011-06-08 | 2 | -4/+11 |
| | | | |||||
| * | | Added tacky-but-useful button for toggling the AO window in the toolbar | McCabe Maxsted | 2011-06-08 | 1 | -3/+6 |
| | | | |||||
| * | | Fixed AO loading on startup and did some light cleanup for readability's ↵ | McCabe Maxsted | 2011-06-08 | 4 | -329/+599 |
| | | | | | | | | | | | | sake. The AO now checks for the notecard every 10 seconds until it's loaded. This whole feature could really use a major refactor | ||||
| * | | Added some log info when ao_template.ini can't be found | McCabe Maxsted | 2011-06-08 | 1 | -0/+5 |
| | | | |||||
| * | | Fixed inventory window not showing item count on login when the full cache ↵ | McCabe Maxsted | 2011-06-08 | 2 | -7/+14 |
| | | | | | | | | | | | | is loaded | ||||
| * | | Re-enabled fetchinventoryonlogin setting and renamed it to ↵ | McCabe Maxsted | 2011-06-08 | 2 | -14/+12 |
| | | | | | | | | | | | | fetchinventoryonlogin2 so it's enabled for users of previous versions | ||||
| * | | Committing some more useful debugging lines | McCabe Maxsted | 2011-06-08 | 1 | -8/+8 |
| | | | |||||
| * | | Always show an item count in the inventory | McCabe Maxsted | 2011-06-08 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed inventory not background fetching on startup when inventory window was ↵ | McCabe Maxsted | 2011-06-08 | 1 | -13/+11 |
| | | | | | | | | | | | | open on quit | ||||
| * | | Now that the cache persists, start background fetching on login. We begin ↵ | McCabe Maxsted | 2011-06-08 | 3 | -10/+35 |
| | | | | | | | | | | | | with the Animations folder uuid sent in the skeleton to hopefully make the AO work as soon as possible | ||||
| * | | Committing fix for #0000302: inventory reloads on every login. Needs more ↵ | McCabe Maxsted | 2011-06-08 | 1 | -4/+7 |
| | | | | | | | | | | | | testing than just a few people | ||||
| * | | Fixed unitiliazed variables in llinventorymodel class | McCabe Maxsted | 2011-06-08 | 1 | -0/+8 |
| | | | |||||
| * | | Inv cleanup phase 2: death to goto | McCabe Maxsted | 2011-06-08 | 1 | -81/+197 |
| | | | |||||
| * | | Always show lldebugs for inventory for now. Logs will be our best debugging ↵ | McCabe Maxsted | 2011-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | tool for the test build | ||||
| * | | Committing some more useful debugging lines | McCabe Maxsted | 2011-06-08 | 1 | -8/+18 |
| | | |