Commit Graph

11437 Commits (fcb240792f0229edd6444e5b152f2022da649c2d)

Author SHA1 Message Date
Aimee Linden fcb240792f VWR-20747 (SNOW-527) FIXED Don't import deprecated python module sets 2010-08-18 11:58:24 +01:00
Aimee Linden 302b3a0770 Merge http://bitbucket.org/aimee_linden/viewer-development-import 2010-08-18 09:14:17 +01:00
Oz Linden ba64912c20 Automated merge with file:///Users/oz/Internal/internal-viewer-development 2010-08-17 21:16:57 -04:00
Oz Linden 84e3e7ccb4 replace universal email notice setting with a comment on how to produce a specific one 2010-08-17 14:43:13 -04:00
Aimee Linden b53ac25d5c SNOW-585 (VWR-20679) FIXED Build failure when the FMOD lib is not present.
Also added Mac version of the same fix, and corrected the warning message in the Linux version that was already there.
2010-08-17 03:38:45 +01:00
Aimee Linden 3b59f688c1 VWR-20673 (SNOW-743) FIXED Compiler warning: 'region_access' may be used uninitialized in this function 2010-08-16 17:03:23 +01:00
Aimee Linden 6981353b1a VWR-20671 (SNOW-514) FIXED Protection on LLInstanceTracker base in LLNameListCtrl needs to be public for gcc >4.1 2010-08-16 16:40:13 +01:00
Aimee Linden e9f14e3001 VWR-20670 (SNOW-506) FIXED Protection on LLInstanceTracker base in LLEventTimer needs to be public for gcc >4.1 2010-08-16 16:39:12 +01:00
Aimee Linden 8aae5a105b Fix executable perms on develop.py which seem to have got lost somewhere in the move. 2010-08-16 13:58:33 +01:00
Christian Goetze (CG) a050c35bf1 No longer need the "build_server" settings, since "build.sh" no longer has that code. Mainly rebuild to clean up the result page. 2010-08-15 15:49:46 -07:00
Christian Goetze (CG) 931e2760c3 Removed email address of inworld public build status indicator, re-rezzed indicator. 2010-08-15 10:02:48 -07:00
Aimee Linden 3bea7e32d3 Changed viewer channel to "Second Life Development" 2010-08-14 19:20:37 +01:00
Oz Linden 4ee6001c92 Automated merge with file:///Users/oz/Internal/viewer-development 2010-08-13 19:31:07 -04:00
Christian Goetze (CG) 2d0e25a645 Add email to public inworld build status indicator. 2010-08-13 14:31:57 -07:00
Christian Goetze (CG) 8a85dee432 Upload build results into a publicly accessible place on S3. 2010-08-13 14:05:00 -07:00
Aimee Linden 5c6cb4c906 Persuade Windows to package the prebuilt llkdu.dll 2010-08-13 19:34:40 +01:00
Aimee Linden 73ca4eac14 Reintroduce check for LLKDU source after downloading the prebuilt lib, to avoid adding a build dependency on it. 2010-08-13 18:34:35 +01:00
Aimee Linden c4e5de1b27 Remove check for LLKDU source in the tree before downloading the pre-built lib. 2010-08-13 13:20:02 +01:00
Aimee Linden b36224bda0 Use -DINSTALL_PROPRIETARY:BOOL=ON when calling develop.py from build.sh
Required because indra/cmake/Variables.cmake uses indra/Server.cmake as a flag to indicate this is an internal build, and set INSTALL_PROPRIETARY to download and install pre-built LLKDU, FMOD and Quicktime.

We need a better way of doing that, but this should get things going for now.
2010-08-13 13:13:11 +01:00
Aimee Linden a646ad1343 Added build.sh and BuildParams 2010-08-13 12:42:34 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Oz Linden 958cec6559 add shamap for converting from private repos 2010-08-13 06:53:17 -04:00
convert-repo fc5a97fc78 update tags 2010-08-13 06:38:37 +00:00
Oz Linden fedb5a25a2 correct license tags from "internal" to "viewergpl" 2010-08-12 20:30:21 -04:00
Aimee Linden 0bc87df82b Change license on lllogin_test.cpp to allow it to be exported.
Set to viewergpl for now.
2010-08-12 15:06:31 +01:00
Aimee Linden bb2770fc09 Remove dependency on viewer_components/eventhost 2010-08-12 14:56:40 +01:00
Tofu Linden f9a61bd30d merge from PE's viewer-release 2010-08-11 13:42:42 +01:00
Eli Linden 766eaf9a50 EXT-8376 FIX en_xui_change for IT truncation; DE fix 2010-08-10 17:21:36 -07:00
Eli Linden 205a5c6083 Merge 2010-08-10 16:11:28 -07:00
Eli Linden 10641acf4c EXT-8370 WIP remove old overrides 2010-08-10 16:09:11 -07:00
Xiaohong Bao 0582257a8a Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-10 16:44:12 -06:00
Xiaohong Bao b9cc3a34da EXT-7399: FIXED: 2.0.2 with http textures loads textures slower than 1.23.5 2010-08-10 16:43:31 -06:00
Eli Linden f5ae33fa53 CT-575 WIP restore PL translation that got lost 2010-08-10 15:24:16 -07:00
Vadim Savchuk 863e380fb6 EXT-8576 FIXED Only attachments are worn if multi-select items on 'My Outfits' tab and press 'Wear' button.
Reason: avatar appearance was not updated if the last selected item was an attachment.
Fix: make sure appearance is updated afterwards, regardless of items types.

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/848/

--HG--
branch : product-engine
2010-08-10 22:38:29 +03:00
Vadim Savchuk 9d6fd1c63f Merge from default branch
--HG--
branch : product-engine
2010-08-10 16:11:33 +03:00
Tofu Linden 8a577f1a1c (empty) merge from PE's viewer-release 2010-08-10 13:57:16 +01:00
Xiaohong Bao f2fd3b8a2f Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-09 17:08:28 -06:00
Xiaohong Bao 8af410aca2 EXT-8596: FIXED: crash at LLTextureFetchWorker::doWork(int) [secondlife-bin lltexturefetch.cpp] line 1061 2010-08-09 17:07:34 -06:00
Eli Linden e56bd45f0d CT-575 WIP PL global edit part 1/2; PL DA set 16 translation for 2.1.1; FR linguistic 2010-08-09 15:06:26 -07:00
Tofu Linden 90a73085fd EXT-8597 FIXED [crashhunters] LLVorbisDecodeState::initDecode()
not for certain fixed, but some robustification.
2010-08-09 16:14:12 +01:00
Vadim Savchuk fcc19791b3 Merge from default branch
--HG--
branch : product-engine
2010-08-09 16:15:59 +03:00
Tofu Linden b22b042edd merge 2010-08-09 14:14:16 +01:00
gabriel lee c70b05082f patching from fixes made in dessie/viewer-release 2010-08-09 12:44:28 +01:00
Tofu Linden 3a79e9bc22 merge from PE's viewer-release 2010-08-07 12:45:31 +01:00
Monroe Linden bcd8443371 Fixes for EXT-8563 "VWR-20156: Prim Media on HUDs has no Audio or Interactivity"
Backed out changeset 1b65d0d42c67 (the fix for EXT-5205), and replaced it with a check in LLPanelPrimMediaControls::nextZoomLevel().

Made LLViewerMediaImpl::calculateInterest() not attempt to calculate distances to HUD attachments, since their global positions are invalid.
2010-08-06 20:06:16 -07:00
Eli Linden 4277bfbba6 CT-575 WIP FR linguistic 2010-08-06 11:17:45 -07:00
Paul Guslisty c187fdcf1f EXT-7963 FIXED (Edit Outfit > Add More > Do not switch to next item type after add/replace)
- Added selected item type (in flat list view) as criterion when determining filter type in 'Add More' panel

- Fixed LLAccordionCtrl::getSelectedTab() method. When 'selection_enabled = false' for LLAccordionCtrlTab, LLAccordionCtrl::getSelectedTab() returned NULL, even if some accordion tab was selected. Now it's OK. Method returns currently selected LLAccordionCtrlTab.

Recovered from bad merge in 13811

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/790/

--HG--
branch : product-engine
2010-08-06 19:41:23 +03:00
Xiaohong Bao f36bd31b3d Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-06 09:40:54 -06:00
Xiaohong Bao 4682264ead EXT-8447: FIXED: crash at LLTextureCache::writeEntryToHeaderImmediately(int,LLTextureCache::Entry &,bool) [secondlife-bin lltexturecache.cpp] 2010-08-06 09:29:33 -06:00
Tofu Linden 0a3493db08 EXT-8579 FIXED Develop.Avatar.Animation Info should not show asset IDs
Made it so that you only see real UUIDs if the viewer thinks you are in real godmode.
2010-08-06 14:28:26 +01:00