97a0bde0ed
VWR-17361
2010-03-03 01:27:56 -08:00
5d2b69207a
merge
...
--HG--
branch : product-engine
2010-03-03 11:17:41 +02:00
616a40bffa
Merge with cf0282cd6d6124ec9633966fe2f8a63097d603ca
...
--HG--
branch : product-engine
2010-03-03 11:06:24 +02:00
9676448291
Shortened code.
...
--HG--
branch : product-engine
2010-03-03 10:32:26 +02:00
3e0c558b8f
Backed out of changeset 9944:2d6fed071539
...
--HG--
branch : product-engine
2010-03-03 10:24:41 +02:00
9272037c9d
Fixed normal bug EXT - 4572 (Click and hold the left mouse button doesn't let you browse tabbed IM floater)
...
- Set mouse capture to the tab container in case of some control \"grab\" it during mouse hovering over tab container.
--HG--
branch : product-engine
2010-03-03 09:47:58 +02:00
5777dfaae6
merge
2010-03-03 13:52:14 +08:00
6ebc1d8858
EXT-5547 : Autopopulation broken due to new web deploy accounts
...
EXT-5673 : Autopopulation: Created outfits copy subfolder contents as well as immediate folder contents
EXT-5632 : Autopopulation is including subfolders even if those aren't outfits
DEV-46683 : Post-Deployment Cleanup
This is a series of changes to fix autopopulation behavior that was broken due to the new surprise web avatar deploy. That deploy surfaced a number of serious issues with the original AP code. I did not write this code and the person who did is no longer here, so I've done my best to fix those issues up.
This is a fairly comprehensive set of changes, but it's necessary given the poor state of the pre-existing code and how many problems it caused the new web avatar deploy.
This new version of the AP code will:
(1) Look for a Library->Clothing->Initial Outfits folder and use that if it exists
(2) Not create outfits out of folders that aren't complete outfits
(3) No longer string match against "More Outfits" in order to ignore outfits
(4) No longer recursively collect folder contents when creating an outfit (i.e. will only look at direct descendents)
2010-03-02 19:56:28 -05:00
836ab95d90
Windows launching changes for vivox and diamondware voice did not get properly merged.
2010-03-02 15:43:20 -08:00
c3c04adaa5
added missing files
2010-03-02 15:11:56 -08:00
3c443a9287
VWR-17386
2010-03-02 15:01:55 -08:00
6c9b0e27c8
Merge
2010-03-02 14:48:14 -08:00
ed481c418b
xui resizing fix; FR fix
2010-03-02 14:47:09 -08:00
66efd3f432
fix windows build break again
2010-03-02 14:29:42 -08:00
41a30a59fb
initial work changing topctrl to popup layer
2010-03-02 14:21:58 -08:00
d79af12e04
Fix windows build break, segfault on exit and bad library link location
2010-03-02 13:42:17 -08:00
0a8cef9747
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-02 16:33:27 -05:00
8c37837876
VWR-17830 for 'en' xml, resizing; JA linguistic fix
2010-03-02 12:55:25 -08:00
6f7f4e3eee
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-02 14:39:53 -05:00
e1e7f78b58
EXT-5848 Getting a lot of warning spam before ATI crash
...
Warning was extraneous and non-related to crash. Initialized a pointer to
be NULL before calling setInfo, which seems to clear up warning.
Updated comments around this to explain what I've found
Code reviewed by Seraph
2010-03-02 14:39:08 -05:00
7dc4ced31f
Fixed normal bug EXT-5754([NAMELESS STRING] Snapshot : "Save" and "Save As")
...
- Added names to fluyout button items.
--HG--
branch : product-engine
2010-03-02 21:18:14 +02:00
15af3f0e6a
Merge
2010-03-02 11:06:43 -08:00
bfd1fd9936
DEV-46346 Cycle5 DE and JA change
2010-03-02 11:06:06 -08:00
27ac50b1a1
Work on normal sub-task EXT-5886 ([HARD CODED] - System message "Teleport completed from" needs translation)
...
- moved hard coded string into teleport_strings.xml (name="completed_from")
--HG--
branch : product-engine
2010-03-02 18:54:37 +02:00
ca37311987
Fixed major bug EXT-3981 ([BSI] scroll bar resets to near the top of inventory search)
...
- disabled auto scrolling in inventory panels when mouse pointer is over the panel
--HG--
branch : product-engine
2010-03-02 16:26:30 +02:00
06b8146686
PE merge
2010-03-02 13:44:52 +00:00
be1739c5d5
Merge from default branch
...
--HG--
branch : product-engine
2010-03-02 15:17:50 +02:00
3e8b1006fb
PE merge.
2010-03-02 12:24:31 +00:00
ccd0aef367
Fixed normal bug EXT-5714 - Chicklet in Conversations Window for Conferences has a Tiny Hotspot.
...
--HG--
branch : product-engine
2010-03-02 12:40:23 +02:00
ca8bce336a
Fixed normal bug EXT-5315 - Minimizing the Conversations floater leaves a tiny floater on HUD space.
...
--HG--
branch : product-engine
2010-03-02 13:57:22 +02:00
9c8a8f388a
Fixed normal bug EXT-5654 - 'More' link doesn't show all text in pick/classified description.
...
Encreased expandable text box max length to match classified description max length.
--HG--
branch : product-engine
2010-03-02 12:03:28 +02:00
d1d195ba90
CID-433
...
Checker: FORWARD_NULL
Function: LLTabContainer::reshapeTuple(LLTabTuple *)
File: /indra/llui/lltabcontainer.cpp
2010-03-02 09:58:34 +00:00
0c6cf6fa78
CID-435
...
Checker: MISSING_BREAK
Function: friendship_offer_callback(const LLSD &, const LLSD &)
File: /indra/newview/llviewermessage.cpp
not-a-bug
2010-03-02 09:56:03 +00:00
1394d21b7a
CID-436
...
Checker: NULL_RETURNS
Function: RecoveredItemCB::fire(const LLUUID &)
File: /indra/newview/llappearancemgr.cpp
2010-03-02 09:53:52 +00:00
e88b6d9c7a
fixed EXT-5693 “llDialog window appears out of viewport if UI scale > 1.0”,
...
corrected calculation of allowed floater rect in docked state;
--HG--
branch : product-engine
2010-03-02 11:53:00 +02:00
ac7539bd68
CID-437
...
Checker: REVERSE_INULL
Function: RecoveredItemLinkCB::fire(const LLUUID &)
File: /indra/newview/llappearancemgr.cpp
2010-03-02 09:50:09 +00:00
bc5be41bc0
CID-440
...
Checker: UNINIT_CTOR
Function: LLPanelClassifiedInfo::LLPanelClassifiedInfo()
File: /indra/newview/llpanelclassified.cpp
2010-03-02 09:47:25 +00:00
bbe2daad55
Fixed normal bug EXT-5856 - "Auto renew each week" checkbox is displayed in the Classified Info from other resident profile.
...
Hide auro_renew checkbox for avatar classifieds and showing for agent classifirds.
--HG--
branch : product-engine
2010-03-02 11:34:14 +02:00
25467eaf4a
Fix windows build break
2010-03-01 23:17:12 -08:00
2b2e8f6301
fix linux build break
2010-03-01 21:30:26 -08:00
a633f3fd22
remove tab
2010-03-01 18:50:36 -08:00
32260e70d0
https://jira.secondlife.com/browse/EXT-5884
...
Added code to support SLAPPS for Media on a Prim
Reviewed by Monroe and Callum via Code Collab (Review 143).
2010-03-01 18:08:00 -08:00
aac32b2fa3
EXT-5867 : Crash when clicking and dragging root folder of object contents into build floater
...
Simple fix to use dynamic cast - the previous unsafe static cast was treating folders as if they were items and then querying permissions, which don't exist for folders.
This code actually existed back in 1.23 but by some stroke of luck worked.
2010-03-08 17:38:50 -05:00
9c8416b34e
VWR-17615 en_xui_change; undoing bad local overrides in fr and es
2010-03-08 12:33:32 -08:00
331d815852
better fix for spam in LLTextureView
...
reviewed by Palmer
2010-03-08 12:09:16 -08:00
9f6e47395c
linguistic fixes
2010-03-08 10:54:59 -08:00
dd5c4cc966
Merge Bao's texture fix and associated changes so we can benefit from speed improvement in Beta 4 (and get QA testing on it early)
2010-03-08 23:00:29 -05:00
2a58e320cb
https://jira.secondlife.com/browse/EXT-5884
...
Added code to support SLAPPS for Media on a Prim
Reviewed by Monroe and Callum via Code Collab (Review 143).
2010-03-01 18:08:00 -08:00
01e26f5499
EXT-3120 drag select lasso for objects is inaccurate
...
reviewed by davep
2010-03-01 18:45:53 -06:00
c999f0f82b
Merge
2010-03-01 16:03:14 -08:00
Eli Linden