aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'nicholaz-patches' into nextJacek Antonelli2008-10-318-30/+131
|\
| * Merge branch 'VWR-2003' into nicholaz-patchesJacek Antonelli2008-09-172-0/+9
| |\
| | * VWR-2003: Possible crash in lltooldraganddrop.cpp.Nicholaz Beresford2008-09-172-0/+10
| | |
| * | Merge branch 'VWR-2683' into nicholaz-patchesJacek Antonelli2008-09-173-2/+11
| |\ \
| | * | VWR-2683: Possible crash accessing dead llviewerregion.Nicholaz Beresford2008-09-173-2/+12
| | |/
| * | Merge branch 'VWR-2685' into nicholaz-patchesJacek Antonelli2008-09-172-2/+7
| |\ \
| | * | VWR-2685: Possible crash in bounding box (getBoundingBoxAgent())Nicholaz Beresford2008-09-172-2/+6
| | |/ | | | | | | | | | from hud attachments.
| * | Merge branch 'VWR-3877-b' into nicholaz-patchesJacek Antonelli2008-09-172-20/+24
| |\ \
| | * | VWR-3877: A nasty possible memory overwrite and two minor leaks.Nicholaz Beresford2008-09-172-20/+25
| | |/
| * | Merge branch 'VWR-3878' into nicholaz-patchesJacek Antonelli2008-09-173-6/+79
| |\ \ | | |/ | |/|
| | * Skip "N files scheduled for deletion" message when nothing scheduled.Jacek Antonelli2008-09-162-1/+9
| | |
| | * Applied VWR-3878: Purging cache textures causes viewer to pauseNicholaz Beresford2008-09-163-6/+71
| |/ | | | | | | for many seconds, with heavy disk activity.
* | Disable fmod by default.Jacek Antonelli2008-10-172-0/+6
| | | | | | | | 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-172-1/+4
| |
* | Commented out vivox / SLVoice from viewer manifest.Jacek Antonelli2008-10-172-28/+30
| |
* | Commented out kdu from viewer manifest.Jacek Antonelli2008-10-172-5/+6
| |
* | Commented out fmod from viewer manifest.Jacek Antonelli2008-10-172-3/+6
| |
* | Updated to SL source 1.21.6.Jacek Antonelli2008-10-171-0/+5
| |
* | Updated source to SL version 1.21.6.Jacek Antonelli2008-10-17371-6786/+11173
|\ \
| * | Second Life viewer sources 1.21.6Jacek Antonelli2008-10-1722-59/+90
| | |
| * | Second Life viewer sources 1.21.5-RCJacek Antonelli2008-10-08189-3464/+3246
| | |
| * | Second Life viewer sources 1.21.4-RCJacek Antonelli2008-10-0353-1230/+974
| | |
| * | Second Life viewer sources 1.21.3-RCJacek Antonelli2008-09-28270-3122/+7952
| | |
* | | 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-036-6/+46
|\ \ \
| * | | 'Offer Teleport' button in friends list is now enabledJacek Antonelli2008-09-232-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | 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-222-1/+5
| | | | | | | | | | | | | | | | regardless of whether the other person is known to be online.
| * | | 'Offer Teleport' button in IM panel is now always enabled,Jacek Antonelli2008-09-222-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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-225-0/+31
| |\ \ \
| * \ \ \ Merge branch 'VWR-8024' into next-mergeJacek Antonelli2008-09-224-0/+39
| |\ \ \ \
| * \ \ \ \ Merge branch 'VWR-2072' into next-mergeJacek Antonelli2008-09-224-0/+35
| |\ \ \ \ \
| | * | | | | VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button.Paul Churchill2008-09-204-0/+35
| | | | | | |
* | | | | | | Added .gitignore to ignore artwork, libs, and compiled stuff.Jacek Antonelli2008-09-281-0/+43
| | | | | | |
* | | | | | | Added event callbacks for Attached Lights and Attached ParticlesJacek Antonelli2008-09-283-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2827-1021/+5906
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-225-0/+31
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | VWR-8341: Bring back a UI indicator of 'Flycam' text.Aimee Trescothick2008-09-225-0/+33
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'VWR-8024' into next-mergeJacek Antonelli2008-09-224-0/+39
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| | * | | VWR-8024: simplify group invites: invite to group from groups list.McCabe Maxsted2008-09-194-0/+41
| | |/ /
| * | | Merge branch 'land-tools' into next-mergeJacek Antonelli2008-09-2210-86/+226
| |\ \ \
| | * | | VWR-8430: Usability improvements to the land tools floater.Aimee Trescothick2008-09-2210-93/+171
| | | | |
| | * | | VWR-2331: Terraform tool variable "strength".Gigs Taggart2008-09-197-6/+68
| | |/ / | | | | | | | | | | | | Contributing authors: Gigs Taggart, Aimee Trescothick, Which Linden.
| * | | Merge branch 'build-tools' into next-mergeJacek Antonelli2008-09-223-7/+56
| |\ \ \
| | * | | Increased maximum settable transparency from 90% to 100%.Jacek Antonelli2008-09-222-1/+4
| | | | |
| | * | | Changed 'Select Texture' to 'Select Faces to Texture'.Jacek Antonelli2008-09-222-1/+6
| | | | |
| | * | | Merge branch 'VWR-7877' into build-toolsJacek Antonelli2008-09-222-4/+9
| | |\ \ \
| | | * | | VWR-7877: Change the default cut increment from 0.05 to 0.025.McCabe Maxsted2008-09-192-4/+9
| | | |/ /
| | * | | Merge branch 'VWR-7827-b' into build-toolsJacek Antonelli2008-09-223-1/+39
| | |\ \ \ | | | |/ / | | |/| |
| | | * | VWR-7827: Allow Dimple/Profile Cut for boxes and box-based prims in the UI.McCabe Maxsted2008-09-163-1/+38
| | | |/
| * | | Merge branch 'viewer-menu' into next-mergeJacek Antonelli2008-09-227-854/+5213
| |\ \ \ | | |/ / | |/| |