aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'libotr' into expDavid Seikel2011-05-12536-1736/+238560
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/llmessage/message.cpp linden/indra/newview/llprefsadvanced.cpp
| * | | Missed checkinJay Threeth2011-05-081-0/+2
| | | |
| * | | Windows build changes, maybe only needed for vc2005. Mostly snprintf -> ↵Chris Tuchs2011-05-0816-1732/+1732
| | | | | | | | | | | | | | | | ll_snprintf, namespace hacks confused vc2005
| * | | Windows build change I am sure ofChris Tuchs2011-05-081-0/+4
| | | |
| * | | Merge branch 'libotr' of github.com:onefang/meta-impy into libotrJay Threeth2011-04-2315-144/+304
| |\ \ \
| | * | | The next part of the UI changes for OTR.David Seikel2011-04-212-50/+33
| | | | | | | | | | | | | | | | | | | | Might be some corner cases left over, but I'm generally happy with this.
| | * | | Half finished UI clean up for OTR, but it works.David Seikel2011-04-212-49/+70
| | | | | | | | | | | | | | | | | | | | | | | | | Hence all the commented out stuff that will be sorted out soon. I have a different idea about how that will work.
| | * | | Allow changing the text on a flyout button.David Seikel2011-04-212-0/+7
| | | | | | | | | | | | | | | | | | | | Needed for the new OTR UI, and complements the same ability on combo boxes (flyout buttons inherit from combo boxes).
| | * | | Move tho OTR preferences to their own floater, with a button in the IM tab.David Seikel2011-04-1910-81/+218
| | | | | | | | | | | | | | | | | | | | This brings that part in line with the general impy look and feel.
| | * | | Apparently there is a wrong client tag for Firestorm out in the wild.David Seikel2011-04-191-0/+12
| | | | | | | | | | | | | | | | | | | | Adding both, to be sure, and I've not seen anyone using it anyway.
| * | | | Build libotr, and static link it, libgpg-error and libgcrypt into the exe ↵Jay Threeth2011-04-233-6/+42
| |/ / / | | | | | | | | | | | | (on linux)
| * | | Merge branch 'exp' of github.com:onefang/meta-impy into libotrJay Threeth2011-04-0584-510/+1974
| |\ \ \
| * | | | Gui fixJay Threeth2011-04-042-3/+2
| | | | |
| * | | | add source to libraries, and cruft for building under windowsJay Threeth2011-04-04482-0/+233473
| | | | |
| * | | | build fixes, might build on linux nowJay Threeth2011-04-046-6/+53
| | | | |
| * | | | last of the hand diff mergesJay Threeth2011-04-032-0/+52
| | | | |
| * | | | checkpoint, non functionalJay Threeth2011-04-0221-2/+1883
| | | | |
| * | | | Merge branch 'exp' of github.com:onefang/meta-impy into libotrJay Threeth2011-04-028-3/+1461
| |\ \ \ \
| * | | | | checkpoint, non functionalJay Threeth2011-04-029-4/+1187
| | | | | |
* | | | | | Temporary workaround for the "TP over 4096 sims" bug.David Seikel2011-05-121-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is temporary, since it's not the real bug, and I want to go work on something else for a while. Plus, the grid I have test regions set up for this bug is having athor problems right now.
* | | | | | Readme rewrite.David Seikel2011-05-091-37/+44
| | | | | | | | | | | | | | | | | | | | | | | | I'll update the Windows special copy later.
* | | | | | Fix the SL creator check. I fixed this wrong last time.David Seikel2011-05-092-28/+21
| | | | | |
* | | | | | Adding slackdog to the default list of grids.David Seikel2011-05-071-0/+17
| | | | | |
* | | | | | Getting client tags from the Imprudence site again.David Seikel2011-05-021-2/+2
| | | | | |
* | | | | | Update Windows copy of the readme file.David Seikel2011-05-021-19/+12
| | | | | |
* | | | | | Bring back the default grid selector, reverts ↵David Seikel2011-05-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | 8de9883c97375c42a70b415a75f7eee6553c0a9c.
* | | | | | Reverting, but generalizing, the user tags in profiles.David Seikel2011-05-021-4/+4
| | | | | |
* | | | | | Meta 7 is dead, no point mentioning it in the about floater.David Seikel2011-05-021-5/+4
| | | | | |
* | | | | | Basing god status on the last name is bound to break in random grids.David Seikel2011-05-021-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | Needs a more general solution.
* | | | | | Mostly revert "Adding the meta 7 web site stuff to the help menu. With ↵David Seikel2011-05-0215-238/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations by Ben and Daniel." This mostly reverts commit 0cc783a5043dc65b763efb2f5b91058cc75823d5. Conflicts: linden/indra/newview/skins/default/xui/da/menu_viewer.xml linden/indra/newview/skins/default/xui/de/menu_viewer.xml linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml linden/indra/newview/skins/default/xui/es/menu_viewer.xml linden/indra/newview/skins/default/xui/fr/menu_viewer.xml linden/indra/newview/skins/default/xui/hu/menu_viewer.xml linden/indra/newview/skins/default/xui/it/menu_viewer.xml linden/indra/newview/skins/default/xui/ja/menu_viewer.xml linden/indra/newview/skins/default/xui/ko/menu_viewer.xml linden/indra/newview/skins/default/xui/pl/menu_viewer.xml linden/indra/newview/skins/default/xui/pt/menu_viewer.xml linden/indra/newview/skins/default/xui/ru/menu_viewer.xml linden/indra/newview/skins/default/xui/tr/menu_viewer.xml linden/indra/newview/skins/default/xui/uk/menu_viewer.xml linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
* | | | | | Revert "Update meta7 login details, and add the beta grid."David Seikel2011-05-021-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit dc695aabe217d3b08554adc04f75997439b0c800. Meta 7 grid no longer exists. B-(
* | | | | | Revert "Update the grid manager to load grids from our meta7 server. Set the ↵David Seikel2011-05-022-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default grid to meta7." This reverts commit 92d51b498d83e7ab917d53a47b566707adc088bf. We are no longer a meta 7 specific viewer.
* | | | | | Default to showing the grid manager on startup.David Seikel2011-05-021-2/+2
| | | | | |
* | | | | | A quick note about the change of direction until I get around to writing it ↵David Seikel2011-05-021-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | properly.
* | | | | | Pathetic excuse for a new logo. Hopefully a better one comse soon.David Seikel2011-04-292-1/+1
| | | | | |
* | | | | | Post merge cleanup.David Seikel2011-04-272-0/+45
| | | | | |
* | | | | | Merge remote-tracking branch 'imprudence/exp' into expDavid Seikel2011-04-26130-1826/+8542
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Changed version to Experimental 2011.04.19McCabe Maxsted2011-04-191-1/+1
| | | | | |
| * | | | | Fixed a compile error (and what I assume to be a source error) in 9cb3d883McCabe Maxsted2011-04-191-1/+1
| | | | | |
| * | | | | fix some flaws in the cloud particle prefsArmin Weatherwax2011-04-1910-36/+73
| | | | | |
| * | | | | add some basic cloud preferences in prefs > advanced >eye candy - please ↵Armin Weatherwax2011-04-198-9/+212
| | | | | | | | | | | | | | | | | | | | | | | | review perms
| * | | | | Added missing NULL check for gAudiostream in chatbar_as_cmdlineMcCabe Maxsted2011-04-191-1/+4
| | | | | |
| * | | | | Applied fix for crash when item just added to the inventory is renamed, ↵McCabe Maxsted2011-04-192-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | ported from Phoenix, patch by Henri Beauchamp and Ansariel Hiller
| * | | | | Modified tag color setting to change the color for all Imprudence tags the ↵McCabe Maxsted2011-04-191-181/+197
| | | | | | | | | | | | | | | | | | | | | | | | client sees. Hardcoded colors are now used for Imp
| * | | | | Merge remote-tracking branch 'jacek/exp' into expMcCabe Maxsted2011-04-190-0/+0
| |\ \ \ \ \
| | * | | | | Fixed a GCC warning in LLFloaterInspect, related to nested templates.Jacek Antonelli2011-04-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The '>>' in the code 'std::map<LLUUID, std::pair<S32, S32>>' could mean bitwise right shift. Using '> >' is unambiguous/better. Full warning message was: cc1plus: warnings being treated as errors In file included from /home/jacek/imprudence/linden/indra/newview/llfloaterinspect.cpp:35: /home/jacek/imprudence/linden/indra/newview/llfloaterinspect.h:78: error: ‘>>’ operator will be treated as two right angle brackets in C++0x /home/jacek/imprudence/linden/indra/newview/llfloaterinspect.h:78: error: suggest parentheses around ‘>>’ expression
| * | | | | | Merge remote-tracking branch 'armin/exp' into expMcCabe Maxsted2011-04-199-23/+330
| |\ \ \ \ \ \
| | * | | | | | workaround crash seemingly specific for win7/64 on AuroraArmin Weatherwax2011-04-171-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | todo: find out and fix why internal_time gets 0
| | * | | | | | Add HeadFollowsMouse debugsetting + UI in preferences > advanced. Defaults ↵Armin Weatherwax2011-04-153-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to *false* if false own avatars head doesn't follow the mouse no matter to what PitchFromMousePosition and YawFromMousePosition are set.
| | * | | | | | linux: several improvements to the starter script, provide a default alsoft.confArmin Weatherwax2011-04-123-12/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * removed several export lines that are not supported * added a line that -if the user enables it- lets openal load a specific alsoft.conf * added a line that -if the user enables it- adds a custom GST_PLUGIN_PATH * create a crashlog package in the viewer folder if stack_trace.log exists.