1afef521ce
Automated merge with ssh://hg.lindenlab.com/james/gooey
2009-12-13 14:15:03 -08:00
6d444398e9
EXT-3422 Add IM/Notification pending button art, style and layout of overflow arrows, align message well with bottom bar
2009-12-13 14:13:42 -08:00
a763409647
EXT-2764 EXT-2766 add and remove help ids to reflect reality
2009-12-13 12:17:55 -05:00
b8ac919d6f
merge
...
--HG--
branch : avatar-pipeline
2009-12-12 15:50:01 -05:00
4019c79a27
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-11 20:58:20 -07:00
b79d694f6d
replace some magic numbers of http status, and fix for DEV-40952/SNOW-208: HTTP GET requests for textures check for http status 203, but should check for 206.
2009-12-11 20:51:06 -07:00
417083068d
EXT-3278: copy & wear in object inventory is now only enabled if we can wear contents
2009-12-11 21:37:36 -05:00
5e4d7ec715
In LLPluginProcessParent, instead of killing the plugin process, terminate it by closing the sockets. This lets it do some cleanup before exiting, instead of just getting shot.
2009-12-11 17:50:59 -08:00
19d9cf8d8e
ext-3404 - script editor scrolls to the bottom and sticks
2009-12-11 16:48:05 -08:00
9ad76199e5
fixed a regression that caused bottom 15 pixels of scrollable text editors to appear blank
2009-12-11 16:25:38 -08:00
ae8c1d1ea8
For EXT-3264: Missing separators in inventory context menus - restore
...
--HG--
branch : avatar-pipeline
2009-12-11 18:49:29 -05:00
943e1fbe02
Merge
2009-12-11 15:46:41 -08:00
3e75137f26
EXT-3277 "<X> Items Fetched" info on InventoryFloater lost.
...
Background fetches track whether they're being done on MyInventory, Library, or both.
Also did some cosmetic header file cleanup.
2009-12-11 18:13:54 -05:00
c6234f352a
variable renames in LLTextBase
2009-12-11 14:34:30 -08:00
6f71bc704a
DEV-40452 (followup) Correct a few more inconsistencies in the 3 new LSL editor tooltips
2009-12-11 14:31:03 -08:00
7ca1bfc78d
fix multiple heads in repo
...
--HG--
branch : avatar-pipeline
2009-12-11 17:29:04 -05:00
d5a58c20a8
merge
2009-12-11 13:51:42 -08:00
401a51cac1
note to get rid of hack
2009-12-11 13:50:54 -08:00
b8fdf82510
fix for ellipses not appearing in single line text widgets
...
fix for ellipses sometimes appearing at end of wrapped line of text
reviewed by James
2009-12-11 13:50:40 -08:00
1128c1e2a7
merge
2009-12-11 13:50:39 -08:00
c400132f02
Merge
2009-12-11 13:49:19 -08:00
fce0d168ae
EXT-3233 Button label vertical placement cannot be adjusted via xml
...
Added bottom_pad attribute to widgets/button.xml and removed old
LLBUTTON_VPAD global and ButtonVPad saved setting.
Reviewed with Richard.
2009-12-11 13:48:35 -08:00
9c0d3e4e86
resolving sidepanel conflict
...
--HG--
branch : avatar-pipeline
2009-12-11 13:17:19 -08:00
99590047eb
automated merge avp->avp
...
--HG--
branch : avatar-pipeline
2009-12-11 16:01:44 -05:00
d2b72fe018
EXT-3373 : Favorites folder disappears after canceling filter
...
Doing a more robust check to see if folders need to be refreshed.
--HG--
branch : avatar-pipeline
2009-12-11 15:57:41 -05:00
612c7a2960
Additional commit for normal sub-task EXT-3142("new message" indicator for object chiclets)
...
--HG--
branch : product-engine
2009-12-11 22:49:16 +02:00
f51bf5d618
Merge
2009-12-11 12:36:46 -08:00
b303dbb086
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-11 20:15:06 +00:00
7c34cd8eb6
EXT-3408: Added support for secondlife:///app/classified SLurls
...
I added a handler for this SLurl type that displays the classifieds
details in the side tray.
In order to do this, you have to open the profile of the classified's
creator first. Which means that I have to ask the server for the
classified's description in order to get the creator id. This is done
with an LLAvatarPropertiesObserver observer. One complication here is
that this observer takes the avatar id as a parameter, but we don't
know that (that's what we're trying to find out) - so I made it
possible to pass in a null avatar id - it's only used to filter out
non-interested observers in the notifyObserver() call.
2009-12-11 20:14:23 +00:00
b2badcaf69
Regression fix for major bug EXT-3135 "Crash after dragging LM from 'Inventory' accordion to fav bar".
...
- Disabled opening sidetray inventory panel on drag-n-drop operations with landmarks in sidetray places panel.
--HG--
branch : product-engine
2009-12-11 22:13:46 +02:00
6245ae0bac
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
2009-12-11 12:10:48 -08:00
bbfb25077b
Fix linux build
2009-12-11 12:10:16 -08:00
5f6e66ad03
Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/
2009-12-11 15:08:52 -05:00
e62b84410c
Updates to filter field labels to make more consistent.
...
https://jira.secondlife.com/browse/EXT-2307
2009-12-11 15:07:57 -05:00
b6b861eaaf
Fixed normal bug EXT-2724 (Mini map mimimizes underneath Nav bar when Favorites bar has been hidden) and
...
partially fixed EXT-2742 (Invalid menu appearance after hiding navigation bar and/or favorites bar). Problem
in fixed part of EXT-2742 was the same as the one which caused EXT-2724.
--HG--
branch : product-engine
2009-12-11 22:03:17 +02:00
fd99f8701c
Fixed normal bug EXT - 2863 (Group Chat List Names right click do not contain view profile or send private message)
...
--HG--
branch : product-engine
2009-12-11 21:44:48 +02:00
2acb204c4b
Fixed normal bug EXT-3281 (Group : Disable "Leave Group" for none).
...
--HG--
branch : product-engine
2009-12-11 21:40:29 +02:00
5b1c92ebb0
EXT-906 Update inventory properties floater with new permissions layout
2009-12-11 11:24:31 -08:00
1f3a554709
Minor gcc compile fix
...
--HG--
branch : avatar-pipeline
2009-12-11 14:16:46 -05:00
ae9ca1be63
EXT-3313 Media Settings window has no background if viewer is too short
...
Code to set default floater position to top-left was causing incorrect
floater height computation when floater XML specified a bottom coordinate.
Reviewed with Callum.
2009-12-11 10:56:49 -08:00
bf9609294f
Enable plugins in the Mac build of the webkit plugin.
2009-12-11 10:43:23 -08:00
b418328083
When building llmediaplugintest on the mac, copy the llcommon dylib so it can actually run.
2009-12-11 10:50:48 -08:00
f042f35381
Merge of viewer2 into avp branch
...
--HG--
branch : avatar-pipeline
2009-12-11 13:37:00 -05:00
7863d7d412
Related to normal sub-task EXT-2478: Implemened chiclet + chiclet window should spawn only for offers from objects. Offers from persons should be shown as toasts
...
--HG--
branch : product-engine
2009-12-11 20:36:32 +02:00
58f17bb735
Fixed normal bug EXT-3263 (Cut and Paste from text chat loses new lines)
...
--HG--
branch : product-engine
2009-12-11 20:26:20 +02:00
a87b99cd95
Merge, fixed conflict in panel_preferences_sound.xml
2009-12-11 10:22:50 -08:00
941497dd30
merge
2009-12-11 10:08:37 -08:00
a5f4531315
Work on major task EXT-2808 (Add speakers moderation (both voice and text) to the Voice Control Panel (Active Speakers List))
...
-- added showing Moderator label near the agent's name if she is a group moderator
--HG--
branch : product-engine
2009-12-11 19:56:45 +02:00
c74d5c483c
EXT-3317 missing string in appearance editor
...
name string wasn't capitalized so couldn't find the actual label to apply.
capitalizing "Wrinkles" makes the string be found. yay.
Reviewed by Vir
2009-12-11 12:47:36 -05:00
c57138b647
Work on major task EXT-2808 (Add speakers moderation (both voice and text) to the Voice Control Panel (Active Speakers List))
...
-- added showing notification that user was muted by moderator (missing changes in the header file)
--HG--
branch : product-engine
2009-12-11 19:29:41 +02:00
Erica