aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge commit 'mccabe/rebranding' into rebrandingJacek Antonelli2008-10-176-372/+357
| |\
| | * windows compile fix and rebranded help menuMcCabe Maxsted2008-10-171-1/+1
| | |
| | * windows compile fix and rebranded help menuMcCabe Maxsted2008-10-172-41/+26
| | |
| | * rebranding with updated help menuMcCabe Maxsted2008-10-172-5/+5
| | |
| | * rebranding compiledMcCabe Maxsted2008-10-173-328/+328
| | |
| * | Merge branch 'merge-1.21.6' into rebrandingJacek Antonelli2008-10-17369-6778/+11164
| |\ \ | | |/ | |/| | | | | | | | | | Conflicts: linden/indra/newview/installers/windows/installer_template.nsi linden/indra/newview/llappviewer.cpp
| * | Rebranded Windows-specific installer/support files.Jacek Antonelli2008-10-148-1501/+1501
| | | | | | | | | | | | Replaced instances of "Second Life" with "Imprudence", etc.
| * | Rebranded Mac-specific installer/support files.Jacek Antonelli2008-10-144-309/+309
| | | | | | | | | | | | Replaced instances of "Second Life" with "Imprudence", etc.
| * | Rebranded Linux-specific installer/support files.Jacek Antonelli2008-10-144-17/+9
| | | | | | | | | | | | Replaced instances of "Second Life" with "Imprudence", etc.
| * | Rebranded platform-independent/shared installer/support files.Jacek Antonelli2008-10-148-74/+74
| | | | | | | | | | | | Replaced instances of "Second Life" with "Imprudence", etc.
| * | Added Imprudence-specific version numbers.Jacek Antonelli2008-10-084-13/+37
| | |
| * | Changed viewer and channel name to "Imprudence".Jacek Antonelli2008-10-084-7/+10
| | |
* | | Package only our free fonts.Jacek Antonelli2008-11-011-1/+3
| | |
* | | Imported Vera Mono and Liberation Sans fonts.Jacek Antonelli2008-11-016-0/+483
| | |
* | | Use Vera Mono and Liberation Sans fonts.Jacek Antonelli2008-11-011-8/+8
| | |
* | | Merge branch 'nicholaz-patches' into nextJacek Antonelli2008-10-317-30/+101
|\ \ \
| * \ \ Merge branch 'VWR-2003' into nicholaz-patchesJacek Antonelli2008-09-171-0/+6
| |\ \ \
| | * | | VWR-2003: Possible crash in lltooldraganddrop.cpp.Nicholaz Beresford2008-09-171-0/+6
| | | | |
| * | | | Merge branch 'VWR-2683' into nicholaz-patchesJacek Antonelli2008-09-172-2/+6
| |\ \ \ \
| | * | | | VWR-2683: Possible crash accessing dead llviewerregion.Nicholaz Beresford2008-09-172-2/+6
| | |/ / /
| * | | | Merge branch 'VWR-2685' into nicholaz-patchesJacek Antonelli2008-09-171-2/+1
| |\ \ \ \
| | * | | | VWR-2685: Possible crash in bounding box (getBoundingBoxAgent())Nicholaz Beresford2008-09-171-2/+1
| | |/ / / | | | | | | | | | | | | | | | from hud attachments.
| * | | | Merge branch 'VWR-3877-b' into nicholaz-patchesJacek Antonelli2008-09-171-20/+21
| |\ \ \ \
| | * | | | VWR-3877: A nasty possible memory overwrite and two minor leaks.Nicholaz Beresford2008-09-171-20/+21
| | |/ / /
| * | | | Skip "N files scheduled for deletion" message when nothing scheduled.Jacek Antonelli2008-09-161-1/+4
| | | | |
| * | | | Applied VWR-3878: Purging cache textures causes viewer to pauseNicholaz Beresford2008-09-162-6/+64
| |/ / / | | | | | | | | | | | | for many seconds, with heavy disk activity.
* | | | Disable fmod by default.Jacek Antonelli2008-10-171-0/+2
| | | | | | | | | | | | | | | | You can give -DFMOD=ON at configure time to turn it on.
* | | | Use FMOD_LIBRARY variable. It's there for a reason.Jacek Antonelli2008-10-171-1/+1
| | | |
* | | | Commented out vivox / SLVoice from viewer manifest.Jacek Antonelli2008-10-171-28/+28
| | | |
* | | | Commented out kdu from viewer manifest.Jacek Antonelli2008-10-171-5/+5
| | | |
* | | | Commented out fmod from viewer manifest.Jacek Antonelli2008-10-171-3/+3
| |_|/ |/| |
* | | Updated source to SL version 1.21.6.Jacek Antonelli2008-10-17369-6778/+11164
|\ \ \ | |_|/ |/| |
| * | Second Life viewer sources 1.21.6Jacek Antonelli2008-10-1722-59/+90
| | |
| * | Second Life viewer sources 1.21.5-RCJacek Antonelli2008-10-08188-3463/+3244
| | |
| * | Second Life viewer sources 1.21.4-RCJacek Antonelli2008-10-0353-1230/+974
| | |
| * | Second Life viewer sources 1.21.3-RCJacek Antonelli2008-09-28268-3115/+7945
| | |
* | | Fixed bad panel_overlay XML from a sloppy merge.Jacek Antonelli2008-10-071-1/+0
| | | | | | | | | | | | Malformed XML was causing crash when opening chat bar.
* | | Merge branch 'offer-teleport' into nextJacek Antonelli2008-10-035-6/+14
|\ \ \
| * | | 'Offer Teleport' button in friends list is now enabledJacek Antonelli2008-09-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | even when the selected user(s) appear to be offline. Mostly for consistency, but also to allow a work-around for times when presence is flakey.
| * | | 'Offer Teleport' button in avatar profile is now always enabled,Jacek Antonelli2008-09-221-1/+1
| | | | | | | | | | | | | | | | regardless of whether the other person is known to be online.
| * | | 'Offer Teleport' button in IM panel is now always enabled,Jacek Antonelli2008-09-221-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | regardless of whether the other person is known to be online. Fixes crash introduced by VWR-2072 when IMing someone not on your friends list, and makes the feature useful in more cases.
| * | | Merge branch 'VWR-8341' into next-mergeJacek Antonelli2008-09-223-0/+23
| |\ \ \
| * \ \ \ Merge branch 'VWR-8024' into next-mergeJacek Antonelli2008-09-223-0/+36
| |\ \ \ \
| * \ \ \ \ Merge branch 'VWR-2072' into next-mergeJacek Antonelli2008-09-223-0/+26
| |\ \ \ \ \
| | * | | | | VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button.Paul Churchill2008-09-203-0/+26
| | | | | | |
* | | | | | | Added event callbacks for Attached Lights and Attached ParticlesJacek Antonelli2008-09-282-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and updated their XUI menu entries to use the new event callbacks. Those menu entries now work.
* | | | | | | Updated to SL source 1.21.2.Jacek Antonelli2008-09-2822-971/+5473
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/SConstruct linden/indra/newview/files.lst linden/indra/newview/llfloatertools.cpp linden/indra/newview/llfloatertools.h linden/indra/newview/lloverlaybar.cpp linden/indra/newview/lloverlaybar.h linden/indra/newview/llviewermenu.cpp linden/indra/newview/skins/default/xui/en-us/floater_tools.xml linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml linden/indra/newview/viewer_manifest.py
| * | | | | | Merge branch 'VWR-8341' into next-mergeJacek Antonelli2008-09-223-0/+23
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | VWR-8341: Bring back a UI indicator of 'Flycam' text.Aimee Trescothick2008-09-223-0/+23
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'VWR-8024' into next-mergeJacek Antonelli2008-09-223-0/+36
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |