09e9cdeb2e
No ticket, Includes cleanup. Spaces cleanup.
...
--HG--
branch : product-engine
2010-01-22 20:20:11 +02:00
48b4b3ab6a
Removed a temporary comment.
...
--HG--
branch : product-engine
2010-01-22 20:16:55 +02:00
69ead1e798
Fixed normal bug EXT-4557 ([BSI] New IM session steals focus)
...
--HG--
branch : product-engine
2010-01-22 20:27:58 +02:00
8cf95e1683
Fixed normal bug EXT-4486(nearby voice list not aligned correctly): Corrected indent of my_panel content. Changed the order of buttons of avatar list item, notice that it affects all avatar lists(on people panel, group chat participants, etc).
...
--HG--
branch : product-engine
2010-01-22 20:27:58 +02:00
fa891c062e
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-01-22 10:02:13 -08:00
16b1af72b2
Fixed (EXT-4589) 'About Land' floater loose information after user quit Place Profile
...
- Fixed Places panel not to remove parcel selection when it is used by "About Land" floater.
--HG--
branch : product-engine
2010-01-22 20:02:10 +02:00
189329853b
Fixed bug EXT-4582 ([BSI] "Report" from avatar inspector does not auto-populate "Abuser name" when Resident is not nearby).
...
Added method LLFloaterReporter::showFromAvatar() to use for remote avatars.
--HG--
branch : product-engine
2010-01-22 20:08:09 +02:00
ff852efdd2
Fixed normal bug EXT-4497 - Edit Profile and Edit Appearance buttons layout issue in side panel.
...
--HG--
branch : product-engine
2010-01-22 18:42:16 +02:00
84dfa02baf
DEV-1195 SVC-580: ATTACH_LPEC / ATTACH_RPEC reversed
2010-01-22 10:25:23 -06:00
1bcf723a3b
Fixed low bug EXT-4306 - Landmark name is shown with prefix in the group notice attachment.
...
--HG--
branch : product-engine
2010-01-22 17:54:13 +02:00
eaefaf7b33
fixed low bug EXT-4594 Highlight landmark on right mouse click in the Favorites Bar
...
--HG--
branch : product-engine
2010-01-22 18:27:17 +02:00
93fd254b9e
merge
...
--HG--
branch : product-engine
2010-01-22 18:18:20 +02:00
2eb0658325
merge
...
--HG--
branch : product-engine
2010-01-22 18:12:30 +02:00
a2105d1702
implemented EXT-4523 Log for all Ad-Hoc conferences is stored in one file
...
* for outgoing ad-hoc sessions chat history is saved into new file for every distinct set of initial participants
format: ["Ad-hoc Conference" "hash"<md5 hash of sorted participants' UUIDs>.txt]
ex: Ad-hoc Conference hash77a0ff26-614d-0dbd-ce19-5da9108f141a.txt
* for incoming ad-hoc sessions, chat history of each session is saved into a separate file:
format: [<ad-hoc session name> <timestamp> <4 first symbols of session id>.txt]
ex: Igor ProductEngine Conference 2010_01_22 07_41 2752.txt
--HG--
branch : product-engine
2010-01-22 18:10:07 +02:00
ba3bbb2131
Fixed bug EXT-4583 ([BSI] Changing group image via drag and drop from Inventory floater doesn't trigger "save" button to become active).
...
Modified LLTextureCtrl's no_commit_on_selection paramater behavior so that
the widget gets dirty only on DnD or when the OK button is pressed in the picker.
This is needed for panels that rely on LLTextureCtrl::isDirty() to enable their "Apply" button.
--HG--
branch : product-engine
2010-01-22 18:06:53 +02:00
c64638dc21
EXT-4492 Deleting gestures from the wearing tab causes the viewer to crash
...
Revert removal of "delete" option from last checkin.
Now enabling "delete" but checking if *this was deleted within removeItem().
2010-01-22 10:48:24 -05:00
4648de2503
merge
...
--HG--
branch : product-engine
2010-01-22 17:41:27 +02:00
8989e65ea3
merge
...
--HG--
branch : product-engine
2010-01-22 17:04:02 +02:00
0c80b1f782
Related to normal task EXT-2214 Refactor IM Control Panels & EXT-3434 (There is no difference between invited and left participants in a Group call (Voice Controls))
...
-- replaced functionality to delayed removing of has left voice partcipants in VCP with one implemented in changeset f48e7cc41501
Behaviour of VCP implemented in EXT-3434 was not changed
--HG--
branch : product-engine
2010-01-22 17:03:13 +02:00
5f334e18b8
merge
...
--HG--
branch : product-engine
2010-01-22 16:28:45 +02:00
7f42a0e8af
fix for normal EXT-4549 [BSI] assigned group roles text appears selectable when it should not
...
--HG--
branch : product-engine
2010-01-22 16:26:42 +02:00
1fb9389822
merge
...
--HG--
branch : product-engine
2010-01-22 16:23:49 +02:00
ad501d7fab
Merge from default branch
...
--HG--
branch : product-engine
2010-01-22 16:19:11 +02:00
a63a1afea6
merge
...
--HG--
branch : product-engine
2010-01-22 15:26:20 +02:00
682fd146b0
fix for normal EXT-4554 [BSI] group join now button goes missing after failure to join due to maximum groups
...
--HG--
branch : product-engine
2010-01-22 15:25:46 +02:00
7b41de5fac
Work on normal task EXT-2214 Refactor IM Control Panels
...
-- removed reference to LLSpeakerMgr from LLPanelGroupControlPanel (group text chat)
--HG--
branch : product-engine
2010-01-22 15:16:53 +02:00
951d6e9d8c
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2010-01-22 15:03:18 +02:00
fd44fbd4ef
made LLTransientFloaterMgr constructor protected;
...
--HG--
branch : product-engine
2010-01-22 15:02:51 +02:00
1a8325f4dc
Work on normal task EXT-2214 Refactor IM Control Panels
...
-- replaced functionality to remove speacker from the list via Event timer.
-- removed calling of LLSpeakerMgr::update from LLPanelGroupControlPanel::draw() (group text chat)
For now list is updated when it is need.
--HG--
branch : product-engine
2010-01-22 14:59:12 +02:00
14bbed35fb
additional fix for EXT-4035 Old sidepanel tab's text remains highlighted when switching to inventory sidepanel tab
...
--HG--
branch : product-engine
2010-01-22 14:48:54 +02:00
d18c46bc15
win build fixed
...
--HG--
branch : product-engine
2010-01-22 14:47:51 +02:00
2d42ec6a83
Fixed normal bug EXT-4321 - Pop-up window with description doesn't appear if choose 'Copy SLUrl' from 'Favorites Bar' context menu.
...
--HG--
branch : product-engine
2010-01-22 14:32:54 +02:00
7fc94e79f0
fix for EXT-4540 [BSI] console flood & freeze on sorting group member listing by role & online status
...
and few additional fixes...
LLScrollListItem->getValue() doesn't contain LLUUID anymore
also fix xml - no icons in Allowed Abilities
--HG--
branch : product-engine
2010-01-22 14:15:05 +02:00
a3f951fa46
Fixed low bug EXT-4596 - '99' number is displayed if there are more than 99 active notifications.
...
--HG--
branch : product-engine
2010-01-22 13:58:53 +02:00
74429f2ed9
fixed EXT-3670 “Clicking on IM session in IM session well closes IM floater”,
...
implemented exclude sets for groups of transient floaters, now transient floaters not closes if user click on view from global exclude set or from floater group set;
made IM floater goes foreground if it visible but not focused instead hide floater;
--HG--
branch : product-engine
2010-01-22 13:42:52 +02:00
4230c65548
Fixed major bug EXT-4609 Deleting duplicate calling cards also removes a Resident from ur Friends list :(
...
- removed separate logic for Residents in the Friends list when Calling card is removed
--HG--
branch : product-engine
2010-01-22 13:17:58 +02:00
11c72472bc
fixed EXT-4529 [BSI] X in tabbed Instant Message functions as a minimize -
...
--HG--
branch : product-engine
2010-01-22 12:51:13 +02:00
dc47f52e9f
merge
2010-01-21 18:40:37 -08:00
76a044faaf
Automated merge with ssh://richard@hg.lindenlab.com/james/gooey
2010-01-21 17:45:52 -08:00
af2f61af50
EXT-4492 Deleting gestures from the wearing tab causes the viewer to crash
...
Removed "delete" from the COF menu, since it is normally disabled from the inventory view.
2010-01-21 20:34:10 -05:00
bc0ed2a02b
Merge.
2010-01-21 16:27:50 -08:00
906284b99f
Fix inverted logic from review.
2010-01-21 16:26:37 -08:00
79f252526f
another fix.
2010-01-21 16:10:29 -08:00
9611af4f59
fixed.
2010-01-21 16:09:38 -08:00
5432b9bd9a
fixing?
2010-01-21 16:00:51 -08:00
63441873cc
updating
2010-01-21 15:58:35 -08:00
c510fed273
Soften another common llassert() failure to a warning.
2010-01-21 15:39:19 -08:00
96721b3ccc
Partial fix for EXT-4508 (nearby media floater parcel media button breaks rtsp)
...
This is actually two seperate issues:
1) After disabling parcel media from the nearby media floater, it can't be re-enabled
2) When you disable parcel media from the nearby media floater, faces displaying it don't revert to their original texture
This change fixes issue (1), by forcing the priority of the inworld media instance to normal in LLViewerMedia::updateMedia() so it will always get reloaded instead of possibly being kept unloaded due to already-loaded prim media.
Issue (2) is still under investigation. In addition to the case where you disable parcel media from the nearby media floater, it also doesn't restore the textures when you leave the parcel, and I think I've even seen it when unloading
2010-01-21 15:39:14 -08:00
6a686700d0
Minor cleanup to the logic in LLViewerParcelMedia::play(), to prevent duplication of code.
2010-01-21 15:23:09 -08:00
878cdc2af9
Merge
2010-01-21 15:16:18 -08:00
Sergei Litovchuk