78d76eb4b0
Automated merge with bundle:E:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.t3awyz\ssh__richard@hg.lindenlab.com_richard_viewer-experience-merge_2xcevh.hg
2011-05-02 17:29:56 -07:00
37ef2c4f0f
EXP-670 Voice for basic mode
...
reviewed by Merov
http://codereview.lindenlab.com/6231263/
2011-04-27 16:45:33 -07:00
5dea0bb37c
merge changes for viewer-social-2
2011-04-08 17:36:13 -04:00
96adfcfaed
merge changes for vwr-25269
2011-04-06 07:35:29 -04:00
80efbeead1
merge
2011-04-01 18:23:13 -07:00
878b0e2da1
Automated merge with http://bitbucket.org/merov_linden/viewer-autobuild2010
2011-04-01 14:13:05 -07:00
4047349ade
merge out latest viewer-autobuild2010 changes
2011-03-31 16:47:35 -04:00
b595bbcf2a
merge changes for storm-1019
2011-03-29 19:22:26 -04:00
a2e3a00270
SOCIAL-714 FIX [PUBLIC] Basic mode to launch with Destinations panel open by default
...
fixed not being able to toggle off avatar/destination guide by clicking button again
2011-03-24 15:48:44 -07:00
d9849178d8
minor whitespace change
2011-03-24 11:22:20 -07:00
fb1facf13a
syncing up to viewer-development
2011-03-24 13:22:43 -04:00
64e8bd3a99
Fixed VWR-25269
2011-03-24 10:20:35 +01:00
fdf63ba075
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
2011-03-23 19:34:15 -07:00
9c82ea334a
SOCIAL-714 FIX [PUBLIC] Basic mode to launch with Destinations panel open by default
2011-03-23 17:02:23 -07:00
fbd241da54
STORM-1019 Resolve merge conflicts
2011-03-19 16:29:32 -04:00
35c39d92e7
SOCIAL-762 FIX Viewer crash if first startup (with cleared settings.xml file) is in Advanced mode
2011-03-19 00:57:10 -07:00
097e076a72
Automated merge with bundle:F:\code\viewer-social+c:\users\richard\appdata\local\temp\thg.yibew7\http__hg.secondlife.com_viewer-development_t3uwtb.hg
2011-03-18 11:42:39 -07:00
5f05157fb7
SOCIAL-749 FIX Clicking on world to dismiss context menus causes your avatar to walk to click
2011-03-17 15:50:51 -07:00
a024493c04
eol fixes
2011-03-15 13:36:23 -07:00
fa277a3b4a
SOCIAL-744 User cannot close Destination Guide and Avatar picker by clicking the respective buttons while open
2011-03-15 11:37:03 -07:00
4986896079
SOCIAL-605 Bottom bar buttons scale differently at lower resolutions
2011-03-14 17:21:45 -07:00
a4f2c570dd
update to latest viewer-development
2011-03-14 11:07:07 -04:00
aac70bccad
Merge with tip of http://hg.secondlife.com/viewer-development (rev 14798)
2011-03-09 15:34:43 -08:00
25ad57c4b6
SOCIAL-603 FIX Move how to button to bottom bar
...
moves scrollbar up from bottom of screen to leave room for resize thumb
2011-03-04 00:40:38 -08:00
0748420c94
STORM-1004 : pull into viewer-development
2011-03-01 15:24:52 -08:00
903b3ab35d
SOCIAL-601 FIX avatar picker hint
2011-02-28 17:38:35 -08:00
31d0bf5ba5
updates destination guide and avatar picker urls
...
added close button to destination guide and avatar picker
2011-02-25 13:48:20 -08:00
874da4cde8
SOCIAL-551 WIP add buttons to open people and profile windows
...
ShowSideTrayPanel action can now toggle undocked panels
OpenSidePanelsInFloaters works now
Clossing a sidepanel floater will not return contents to side tray
close button enabled in minimal skin for side panel floaters
2011-02-24 18:37:06 -08:00
20ad5181ba
SOCIAL-551 WIP Add buttons to open people and profile windows
...
bottom tray button now toggles profile window
2011-02-23 16:44:04 -08:00
668307e4e3
STORM-1019 Add ability to display beacons for Media on a Prim objects
...
Changes merged into viewer 2 by Jonathan Yap
2011-02-23 15:50:55 -05:00
776dde83ed
STORM-889 FIXED Put Link/Unlink in Edit Panel
...
- Moved callbacks for Link/Unlink to the LLSelectMgr
- Binded Link/Unlink callbacks with buttons in Build Floater
- Replaced view_listener_t usage for Link, Unlink, EnableLink, EnableUnlink with boost::bind
2011-02-22 15:24:55 +02:00
23717a0918
BUG STORM-1004 FIXED Unblocking/blocking name sometimes deletes identically named entry, but of different TYPE
...
LLMuteList stores muted objects in two sets: set of names and set of ids. Avatar objects are stored by ids (set of ids), other objects can be stored both by name(set of names) or ids
- Delete items from corresponding set (from set of names or ids), not form both sets at time.
- Improved isMuted method's logic. Now if avatar is tested whether it's muted or not, don't search its name in the set of names.
2011-02-18 15:28:38 +02:00
99d4f57351
merge out from viewer-development
2011-01-21 16:37:39 -05:00
b01ca1293b
merge up to latest viewer-development
2011-01-13 11:14:13 -05:00
756a4e26da
Merge with viewer-development
2011-01-12 19:00:36 -08:00
d23f7df822
merge
2011-01-07 15:22:22 -08:00
433ad05ae9
merge up to latest viewer-development
2010-12-27 14:29:11 -05:00
0f5d8e53ca
Merge with viewer-development
2010-12-22 14:24:28 -08:00
dee57bea25
Merge from viewer-development.
2010-12-20 11:21:17 -08:00
b9acc0285c
Dummy placeholder code for ER-414: Add object update type debug rendering view
2010-12-16 19:19:20 -08:00
ad99134668
Automated merge with file:///Users/oz/Work/viewer-development
2010-12-14 22:59:36 -05:00
e040f16a4f
merge
2010-12-10 10:40:38 -08:00
efa42a6aab
merge up to viewer-development
2010-12-04 09:14:58 -05:00
598450785b
merge
2010-12-02 14:51:16 -08:00
1e050c2ed8
merge
2010-12-02 14:33:42 -08:00
522bcf17b7
SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be useful for viewer web apps
2010-11-30 20:52:30 -08:00
0f72f152e8
merge fix for STORM-616
2010-11-19 15:52:52 -05:00
daae74e569
Changed Sit Down shortcut definition and reordered menu slightly.
2010-11-19 15:35:24 -05:00
424786d8d0
Added viewer-side "object overlaps parcel" check encroachment returnabilty UI
...
Reviewed with Falcon
2010-11-18 15:55:53 -08:00
86260988e3
STORM-576 FIXED Hooked up code to preference that allows users to enable double-click to teleport or use auto-pilot.
...
- Added dirty flag that is set true when user changes checkbox or chooses one of radiobuttons connected to double-click action. No change of user settings happens on this commit, because user may press cancel or close floater. If user presses OK, and flag is true, user changes are applied to settings.
If user clicks cancel or closes floater, controls are reverted to the state they were before changes, using settings to determine it.
- Removed double-click action menu items and code that handled them to avoid functionality duplication and synchronization problems.
2010-11-18 13:14:06 +02:00
Richard Linden