Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nicholaz-patches' into next | Jacek Antonelli | 2008-10-31 | 7 | -30/+101 |
|\ | |||||
| * | Merge branch 'VWR-2003' into nicholaz-patches | Jacek Antonelli | 2008-09-17 | 1 | -0/+6 |
| |\ | |||||
| | * | VWR-2003: Possible crash in lltooldraganddrop.cpp. | Nicholaz Beresford | 2008-09-17 | 1 | -0/+6 |
| | | | |||||
| * | | Merge branch 'VWR-2683' into nicholaz-patches | Jacek Antonelli | 2008-09-17 | 2 | -2/+6 |
| |\ \ | |||||
| | * | | VWR-2683: Possible crash accessing dead llviewerregion. | Nicholaz Beresford | 2008-09-17 | 2 | -2/+6 |
| | |/ | |||||
| * | | Merge branch 'VWR-2685' into nicholaz-patches | Jacek Antonelli | 2008-09-17 | 1 | -2/+1 |
| |\ \ | |||||
| | * | | VWR-2685: Possible crash in bounding box (getBoundingBoxAgent()) | Nicholaz Beresford | 2008-09-17 | 1 | -2/+1 |
| | |/ | | | | | | | | | | from hud attachments. | ||||
| * | | Merge branch 'VWR-3877-b' into nicholaz-patches | Jacek Antonelli | 2008-09-17 | 1 | -20/+21 |
| |\ \ | |||||
| | * | | VWR-3877: A nasty possible memory overwrite and two minor leaks. | Nicholaz Beresford | 2008-09-17 | 1 | -20/+21 |
| | |/ | |||||
| * | | Skip "N files scheduled for deletion" message when nothing scheduled. | Jacek Antonelli | 2008-09-16 | 1 | -1/+4 |
| | | | |||||
| * | | Applied VWR-3878: Purging cache textures causes viewer to pause | Nicholaz Beresford | 2008-09-16 | 2 | -6/+64 |
| |/ | | | | | | | for many seconds, with heavy disk activity. | ||||
* | | Disable fmod by default. | Jacek Antonelli | 2008-10-17 | 1 | -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 Antonelli | 2008-10-17 | 1 | -1/+1 |
| | | |||||
* | | Commented out vivox / SLVoice from viewer manifest. | Jacek Antonelli | 2008-10-17 | 1 | -28/+28 |
| | | |||||
* | | Commented out kdu from viewer manifest. | Jacek Antonelli | 2008-10-17 | 1 | -5/+5 |
| | | |||||
* | | Commented out fmod from viewer manifest. | Jacek Antonelli | 2008-10-17 | 1 | -3/+3 |
| | | |||||
* | | Updated source to SL version 1.21.6. | Jacek Antonelli | 2008-10-17 | 371 | -6786/+11173 |
|\ \ | |||||
| * | | Second Life viewer sources 1.21.6 | Jacek Antonelli | 2008-10-17 | 22 | -59/+90 |
| | | | |||||
| * | | Second Life viewer sources 1.21.5-RC | Jacek Antonelli | 2008-10-08 | 189 | -3464/+3246 |
| | | | |||||
| * | | Second Life viewer sources 1.21.4-RC | Jacek Antonelli | 2008-10-03 | 53 | -1230/+974 |
| | | | |||||
| * | | Second Life viewer sources 1.21.3-RC | Jacek Antonelli | 2008-09-28 | 270 | -3122/+7952 |
| | | | |||||
* | | | Fixed bad panel_overlay XML from a sloppy merge. | Jacek Antonelli | 2008-10-07 | 1 | -1/+0 |
| | | | | | | | | | | | | Malformed XML was causing crash when opening chat bar. | ||||
* | | | Merge branch 'offer-teleport' into next | Jacek Antonelli | 2008-10-03 | 5 | -6/+14 |
|\ \ \ | |||||
| * | | | 'Offer Teleport' button in friends list is now enabled | Jacek Antonelli | 2008-09-23 | 1 | -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 Antonelli | 2008-09-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | regardless of whether the other person is known to be online. | ||||
| * | | | 'Offer Teleport' button in IM panel is now always enabled, | Jacek Antonelli | 2008-09-22 | 1 | -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-merge | Jacek Antonelli | 2008-09-22 | 4 | -0/+24 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'VWR-8024' into next-merge | Jacek Antonelli | 2008-09-22 | 3 | -0/+36 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'VWR-2072' into next-merge | Jacek Antonelli | 2008-09-22 | 3 | -0/+26 |
| |\ \ \ \ \ | |||||
| | * | | | | | VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button. | Paul Churchill | 2008-09-20 | 3 | -0/+26 |
| | | | | | | | |||||
* | | | | | | | Added event callbacks for Attached Lights and Attached Particles | Jacek Antonelli | 2008-09-28 | 2 | -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 Antonelli | 2008-09-28 | 23 | -971/+5475 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-merge | Jacek Antonelli | 2008-09-22 | 4 | -0/+24 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | VWR-8341: Bring back a UI indicator of 'Flycam' text. | Aimee Trescothick | 2008-09-22 | 4 | -0/+24 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge branch 'VWR-8024' into next-merge | Jacek Antonelli | 2008-09-22 | 3 | -0/+36 |
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | VWR-8024: simplify group invites: invite to group from groups list. | McCabe Maxsted | 2008-09-19 | 3 | -0/+36 |
| | |/ / | |||||
| * | | | Merge branch 'land-tools' into next-merge | Jacek Antonelli | 2008-09-22 | 9 | -86/+193 |
| |\ \ \ | |||||
| | * | | | VWR-8430: Usability improvements to the land tools floater. | Aimee Trescothick | 2008-09-22 | 9 | -93/+152 |
| | | | | | |||||
| | * | | | VWR-2331: Terraform tool variable "strength". | Gigs Taggart | 2008-09-19 | 6 | -6/+54 |
| | |/ / | | | | | | | | | | | | | Contributing authors: Gigs Taggart, Aimee Trescothick, Which Linden. | ||||
| * | | | Merge branch 'build-tools' into next-merge | Jacek Antonelli | 2008-09-22 | 2 | -7/+37 |
| |\ \ \ | |||||
| | * | | | Increased maximum settable transparency from 90% to 100%. | Jacek Antonelli | 2008-09-22 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Changed 'Select Texture' to 'Select Faces to Texture'. | Jacek Antonelli | 2008-09-22 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'VWR-7877' into build-tools | Jacek Antonelli | 2008-09-22 | 1 | -4/+4 |
| | |\ \ \ | |||||
| | | * | | | VWR-7877: Change the default cut increment from 0.05 to 0.025. | McCabe Maxsted | 2008-09-19 | 1 | -4/+4 |
| | | |/ / | |||||
| | * | | | Merge branch 'VWR-7827-b' into build-tools | Jacek Antonelli | 2008-09-22 | 2 | -1/+31 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | VWR-7827: Allow Dimple/Profile Cut for boxes and box-based prims in the UI. | McCabe Maxsted | 2008-09-16 | 2 | -1/+31 |
| | | |/ | |||||
| * | | | Reindented and cleaned up menu XML for code readability. | Jacek Antonelli | 2008-09-21 | 1 | -1553/+1923 |
| | | | | |||||
| * | | | Merge branch 'VWR-5082' into menu_viewer | Jacek Antonelli | 2008-09-21 | 6 | -0/+885 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/newview/llviewermenu.cpp | ||||
| | * | | | Added llfloaterbulkpermission.cpp to SCons build list. | Jacek Antonelli | 2008-09-21 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | VWR-5082: 'Set permissions on selected task inventory' feature. | Michelle2 Zenovka | 2008-09-20 | 5 | -0/+883 |
| | |/ / |