Commit Graph

11983 Commits (ec2eae01fa5f9f47492035537f9ddbee86471a84)

Author SHA1 Message Date
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
Vadim Savchuk 6c8494295a Merge from default branch
--HG--
branch : product-engine
2010-08-16 15:35:40 +03: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
Brad Payne (Vir Linden) d77c3e3600 merge 2010-08-13 14:39:04 -04:00
Aimee Linden 5c6cb4c906 Persuade Windows to package the prebuilt llkdu.dll 2010-08-13 19:34:40 +01:00
Brad Payne (Vir Linden) 37a0124bfd DEV-52580 FIX 2010-08-13 14:33:30 -04: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
Andrew Dyukov f523a589a7 EXT-8536 FIXED Fixed wrong behaviour of slidercontrol's lineeditor revert on escape.
Though bug description mentioned only appearance, bug reproduced for all slidercontrols. The cause of returning on escape to old value
instead of last commited one was that on commit slidercontrol set text for it's lineeditor which was the same as the one currently typed
into lineeditor(and it seems logical). But LLLineEditor::setText() has check at it's beginning which compares text which is being set to the
one which is already there. If this check succeeds, we exit the method and thus saving of value for revert is not reached. That's why when revert happened
on escape older value then the last commited was set in lineeditor.

- Added additional call of setText() in sliderctrl to force changes in currently set text so that on next call with "real" text saving of reverted value was reached.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/856/

--HG--
branch : product-engine
2010-08-13 19:33:18 +03:00
Loren Shih f369ebec24 EXT-8650 Can wear multiple copies of no-copy item via object links
* EXT-8661 Take out unused mRegisteredAttachments in LLAppearanceMgr

Removed unused mRegisteredAttachments.  Not sure what this was used for, but it's no longer used.
2010-08-13 11:26:22 -04:00
Vadim Savchuk 482d3abc3c EXT-8662 FIXED Crash on renaming incomplete inventory items.
I couldn't reproduce this problem, but from what I've seen in the crash
reporter, this is a very old bug affecting viewers 1.2x and 2.x.
When user tries to rename an incomplete inventory item, viewer crashes.

The fix is to disallow renaming incomplete items.

Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/857/

--HG--
branch : product-engine
2010-08-13 18:13:37 +03:00
Loren Shih 5881252ab2 EXT-8650 Can wear multiple copies of no-copy item via object links
* EXT-8688 Automatically detach same object is detected
* EXT-8689 Cleanup detachAttachmentIntoInventory code

When an object arrives as an attachment, if it's already attached then it's automatically detached.
2010-08-13 11:12:51 -04: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
Tofu Linden 7f08555143 merge from viewer-release 2010-08-13 12:40:45 +01:00
Tofu Linden 40eda71ff0 merge from PE's viewer-release 2010-08-13 12:39:47 +01:00
Tofu Linden 2dd1854d98 merge 2010-08-13 12:26:25 +01:00
Tofu Linden 9989c304c9 trivial comment changes while I was in this code. 2010-08-13 12:25:59 +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
Xiaohong Bao 0742f89208 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-12 21:53:30 -06:00
Xiaohong Bao 4627c4b698 Fix for EXT-8578: Blurry image in profile never resolves - texture queue problem? 2010-08-12 21:52:22 -06:00
Oz Linden fedb5a25a2 correct license tags from "internal" to "viewergpl" 2010-08-12 20:30:21 -04:00
Christian Goetze (CG) da8374f233 Pulled "dessie/viewer-release" into "dessie/viewer-public". 2010-08-12 12:44:21 -07:00
Christian Goetze (CG) cde71ddc88 Pulled "viewer-hotfix" into "viewer-release". 2010-08-12 12:42:25 -07:00
Christian Goetze (CG) 3678a3e6e5 Pulled "viewer-hotfix" into "viewer-release". 2010-08-12 12:29:51 -07:00
Brad Payne (Vir Linden) 6c1796c105 DEV-52580 WIP: disallow multiple links to the same attachment in updateAppearanceFromCOF() 2010-08-12 11:00:39 -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 50d5401e94 merge from viewer-release 2010-08-12 14:21:05 +01:00
Tofu Linden c574a819ec Fix a bunch of typos in new enums, one of which was causing a build failure. 2010-08-12 14:20:33 +01:00
Vadim Savchuk 44adcdecd0 EXT-8473 FIXED Fixed renaming inventory items without hitting Enter.
Problem:

The bug was caused by the fix of EXT-6682 that prematurely forgets the item
being renamed (by resetting mRenameItem) whenever the renamer input field loses focus.
That's why we couldn't actually finish renaming item.

Fix:

The code is quite messy, but I'll try to explain.

There are three cases when we should hide the renamer:
1) ESC key is hit (just hide).
2) ENTER key is hit (rename, then hide).
3) renamer loses focus (rename, then hide).

In the first two cases we manually remove the renamer from the popups
list -- by calling gViewerWindow->removePopup(mRenamer).
In the third case that's done automatically.
So, in all cases the onRenamerLost() pop-up is called that hides the renamer
and only *then* resets mRenameItem.
Not only this approach fixes the bug -- I hope it's a bit more straightforward too.

Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/854/

--HG--
branch : product-engine
2010-08-12 16:16:57 +03:00
Vadim Savchuk 5de5510f58 EXT-8629 FIXED Enable the Wear button in My Outfits for outfits that are subsets of the current outfit.
We allowed wearing any outfit that contains non-worn items.
Now it appears to be wrong, therefore and I changed condition so that
we allow wearing any outfit (or folder) that contains the full set of body parts.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/855/

--HG--
branch : product-engine
2010-08-12 16:13:48 +03:00
Tofu Linden 4281e2bd01 EXT-8589 FIXED Nothing happens if choose 'Invite to Group' from avatar's 3D context menu
The groups-chooser was auto-closing when the IW selection was lost, which in the case of right-clicking on (other) avatars is immediately.  The 'hg blame' is lost in merge-fubarism so I can't track why this behaviour was ever introduced, but I can think or (or find) no reason to autoclose in this case - the groups picker dialog doesn't even use the current selection, let alone care if it's lost.
2010-08-12 14:12:54 +01:00
Sergei Litovchuk dd692f17ab EXT-8628 FIXED Crash in LLVOAvatarSelf::getAttachedPointName().
The crash was reproducible only on startup. Apparently, gAgentAvatarp was not valid at that point.
Worked around by checking gAgentAvatarp for being valid.

I didn't investigate what the root cause of the problem was (probably the new multi-attachments implementation), I just needed my viewer to work.

Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/847/.

--HG--
branch : product-engine
2010-08-12 15:56:51 +03:00
Tofu Linden 98870dfa24 merge from viewer-release 2010-08-12 12:53:53 +01:00
Tofu Linden 6c79b84600 merge from PE's viewer-release 2010-08-12 12:51:00 +01:00
Paul Guslisty 7a0b016c8c EXT-8205 FIXED (Items in \"Add more\" panel are not sorted by name)
- Modified LLWearableItemTypeNameComparator so that it can be more reusable and adjustable

- Set LLWearableItemTypeNameComparator for WearableItemsList ('List view' of 'Add More' panel) due to sort clothings by name

- Modified and applied patch form https://codereview.productengine.com/secondlife/r/620/diff/2/#index_header. This patch was discarded because specification was changed

Restored diff after bad merge at 13817

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/765/

--HG--
branch : product-engine
2010-08-12 13:48:36 +03:00
Paul Guslisty 6cab04ce2f EXT-8599 FIXED (Search Floater - \"loading\" and \"Done\" text in lower left is cut-off)
- Added height parameters and removed unnecessary bottom parameter

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/852/

--HG--
branch : product-engine
2010-08-12 13:20:52 +03:00
Paul Guslisty 7312471e7f EXT-7951 FIXED (Mini-Location panel appearance design issues)
- Added callback on show\hide Mini Location Panel event. This callback sets proper initial minimized position depending on state (shown or hidded) Mini Location Panel. Also callback shifts vertically already minimized floaters so that they don't overlap Mini Location Panel

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/851/

--HG--
branch : product-engine
2010-08-12 13:19:23 +03:00
Xiaohong Bao 11c4985674 Automated merge with ssh://hg.lindenlab.com/q/viewer-release 2010-08-11 19:32:00 -06:00
Xiaohong Bao 5be5c3f0da fix for EXT-7399: 2.0.2 with http textures loads textures slower than 1.23.5 and
EXT-7397: decoding textures get stuck in REQ status
2010-08-11 19:31:20 -06:00
Dessie Linden 51d460089e Changed channel info back to Second Life Developer 2010-08-11 14:04:27 -07:00
Dessie Linden 67d1837ce7 Updated viewer patch number & channel 2010-08-11 11:14:59 -07:00