4a8379d2d3
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-02-02 17:11:33 -08:00
5285e5479c
Remove a couple of header deps on llprimitive.h for faster buildy goodness.
2010-02-02 23:11:27 +00:00
f22fc1e612
automated merge viewer2.0->viewer2.0
2010-02-02 17:15:46 -05:00
7b207cfde4
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-02-02 14:15:05 -08:00
847a3a1220
EXT-4243 : Sorting is broken in inventory
...
Landmarks were being special cased for sorting; removed this so that they sort by the same rules of other folders.
2010-02-02 17:11:42 -05:00
e3344abb95
merge.
2010-02-02 21:31:59 +00:00
b1519222ab
PE merge.
2010-02-02 21:18:41 +00:00
7fdf8d55d7
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-02 15:16:26 -05:00
2dbf48d05c
Adjusted vertical position of damage text and icon.
...
https://jira.secondlife.com/browse/EXT-4861
2010-02-02 15:16:14 -05:00
0c7e18cbc6
Fixed normal bug EXT-4127 ([BSI] Cannot copy/paste from another resident's picks / classifieds)
...
--HG--
branch : product-engine
2010-02-02 21:53:52 +02:00
047176cd6f
Fixed normal bug EXT-4115 (Cannot copy/paste from another resident's profile)
...
--HG--
branch : product-engine
2010-02-02 21:53:52 +02:00
347daac67d
Fixed normal bug EXT-4105 ([BSI] group names are not able to be copied from side panel) - changed LLTextBoxEx class to inherit the LLTextEditor behavior
...
--HG--
branch : product-engine
2010-02-02 21:53:52 +02:00
df7292b716
fixed low Bug EXT-4242 History Dropdown should appear immediately when click-dragging downward from back button
...
LLPullButton has been implemented to handle such behavior
--HG--
branch : product-engine
2010-02-02 21:38:36 +02:00
a4d81d0f69
Merge
2010-02-02 11:32:33 -08:00
27c08cec25
fixed bug EXT-4241 Back button in nav bar should remain depressed during click-hold
...
Cause:
mouse capture was reset by the popup menu. It broke mouse event workflow and made invalid changing of pressed state.
Solution:
Workaround with mouseUp callback of gMenuHolder has been implemented to handle mouseUp event and to change pressed state of the buttons.
--HG--
branch : product-engine
2010-02-02 21:03:04 +02:00
f0a18ec0a6
Fixed normal bug EXT-4758 ("Call" button in IM window is disabled after call from parcel with disabled voice)
...
- One more voice client state is now treated by voiceWorking() as valid.
--HG--
branch : product-engine
2010-02-02 20:55:45 +02:00
b90d1d0b6f
merge.
2010-02-02 18:32:33 +00:00
7ba025b625
merge.
2010-02-02 18:19:36 +00:00
1da3feec8b
merge
...
--HG--
branch : product-engine
2010-02-02 20:11:57 +02:00
b817a9333c
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-02 12:33:54 -05:00
8920a18aff
Updated filter text.
...
http://jira.secondlife.com/browse/EXT-4844
2010-02-02 12:32:38 -05:00
cb57f65f68
merge.
2010-02-02 17:28:55 +00:00
b6bc7d94f2
trivial comment fix while I was there!
2010-02-02 17:22:47 +00:00
f937153a01
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-02 17:20:01 +00:00
e563a07659
DEV-32540: Lots of object IM and SLurl improvements
...
- Don't let object names that are URLs override links to display the
remote object inspector
- Don't hyperlink the object name in the remote object inspector
- Made the <nolink>...</nolink> regex more robust and made it support
non-URLs between the tags, so that we don't get random <nolink> tags
when trying to disable URLs in user-typed text.
- Improved the llurlentry unit test and added some more test cases.
- Hooked up another LLViewerMessage code path to objectim SLapps to
pass down the owner and slurl information.
- Made a few LLUrlEntryBase methods be const methods, because they are
- Fixed a bug in the remote object inspector where it would never show
the teleport URL.
2010-02-02 17:19:14 +00:00
d51b7c4b34
merge.
2010-02-02 17:16:51 +00:00
3a428ed63a
PE merge.
2010-02-02 17:06:14 +00:00
b01854ed46
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-02 12:05:03 -05:00
353ed64274
Created new graphics for build tools "selected" states.
...
http://jira.secondlife.com/browse/EXT-4357
2010-02-02 12:04:42 -05:00
e367c41298
Working on (EXT-4347) Moving object contents to inventory opens files, changes menu.
...
- Removing LLPanelPlaces dependency from open_inventory_offer handler.
- Added landmark offer handling to Places panel.
--HG--
branch : product-engine
2010-02-02 18:48:40 +02:00
5fc508bbc2
Fixed major bug EXT-4811 ([BSI] Attempt to pay an object shows wrong Resident name in Pay Resident floater).
...
Removed hardcoded payee name.
--HG--
branch : product-engine
2010-02-02 18:19:39 +02:00
210fed642b
PE merge.
2010-02-02 16:14:53 +00:00
0a41542f23
reverted accidental change to floater_im_session.xml
...
--HG--
branch : product-engine
2010-02-02 18:00:45 +02:00
250680a078
fixed EXT-4755 Own context menu in voice chat participants list has 'Add Friend' and 'Pay' enabled
...
--HG--
branch : product-engine
2010-02-02 17:58:29 +02:00
9a4d079b92
merged new changes
2010-02-02 15:18:06 +00:00
85cb82fdda
Fixed normal bug EXT-4696 - Teleport offer window is not alligned to the center of game area
...
--HG--
branch : product-engine
2010-02-02 17:04:31 +02:00
7c7bea0344
acted on code review advise, check some return pointers for nullness etc
2010-02-02 14:28:47 +00:00
6ea944b38f
Supplementary fix EXT-4770 : Voice muting not working properly due to a change in the Vivox API
...
The master voice mute in preferences wasn't working either, due to the minimum scaled volume now being 30 instead of 0.
Reviewed by Lynx.
2010-02-02 14:10:38 +00:00
47162acede
no ticket. Removing the hack from llfloater.This code is dangerous. It involved losing of topctrl in focusmgr and can cause strange bugs and problems.
...
--HG--
branch : product-engine
2010-02-02 14:49:58 +02:00
5faa8b44d5
merge
...
--HG--
branch : product-engine
2010-02-02 14:39:28 +02:00
0763fac765
added saving of nearby chat history - EXT-4777 Implement saving and loading chat history for Nearby Chat (both plain text and widgeted chat)
...
--HG--
branch : product-engine
2010-02-02 14:37:31 +02:00
0e9bf5e3e5
merge
...
--HG--
branch : product-engine
2010-02-02 14:36:17 +02:00
371885c373
fix for normal EXT-4810 Block hot-keys in mouse-look mode
...
--HG--
branch : product-engine
2010-02-02 14:35:37 +02:00
81487c2a4c
Fxed normal bug EXT - 4106 (Tabbed IM floater isn't highlighting labels when new IMs are received)
...
--HG--
branch : product-engine
2010-02-02 14:33:38 +02:00
38315a063d
Fixed normal bug EXT-4740 - Object inspector hides however context menu present
...
--HG--
branch : product-engine
2010-02-02 14:25:31 +02:00
f69510e20c
added loading/parsing of Nearby Chat history - EXT-4777 Implement saving and loading chat history for Nearby Chat (both plain text and widgeted chat)
...
--HG--
branch : product-engine
2010-02-02 14:19:15 +02:00
61609d93bb
Fixed major bug (EXT-2316) Insert the option "pay" in the profile.
...
- Restored fix made in viewer-2-0/product-engine changeset 4880:ff1363072741.
--HG--
branch : product-engine
2010-02-02 14:01:54 +02:00
fb174d1de3
merge
...
--HG--
branch : product-engine
2010-02-02 13:20:00 +02:00
e6538ddbe9
fix for low EXT-4780 Nearby chat windows doesn't pop up when clicking on object chat toast
...
--HG--
branch : product-engine
2010-02-02 13:18:23 +02:00
95d0df4ab0
merged back my last changes
2010-02-02 10:58:47 +00:00
Rick Pasetto