adf6ca947e
Merge up to 26121/6a223218718e; latest RLVa from catznip-3.2.0 ( http:///bitbucket.org/Kitty_Barnett/catznip-3.2.0 ).
2012-01-23 17:09:53 +01:00
6958381112
Merge up to 26092/6ceebf5ce17b; Branch Chat-NearbyChat from catznip-3.2.0 ( http:///bitbucket.org/Kitty_Barnett/catznip-3.2.0 ).
...
This will enable chat docking/undocking from contacts floater again.
2012-01-23 14:56:47 +01:00
6ef7838cd2
Merge up to 25972:7fceba778ee6 (V/Dev)
2012-01-17 21:15:06 +01:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
0434771b04
EXP-1766 FIXED Disabled updating agent AFK state if the viewer is disconnected. Possible crash fix.
2012-01-10 17:20:49 +02:00
176f020bb3
Added option for console background image and URL parsing; Disabled URL parsing for debug view console
2012-01-06 16:31:38 +01:00
681ecc0d0f
EXP-1593 FIXED Navbar was displayed after exitting hide contorls mode, even if disabled via settings.
...
Apparently, the way we showed/hid the panels was wrong.
2011-12-28 18:35:00 +02:00
1c71b90300
EXP-1651 FIXED Added saving window size after each reshape.
...
Fixed broken resize indicator on Linux viewer window (EXP-1580).
2011-12-06 21:43:58 +02:00
ef0552a090
EXP-1642 FIX -- Viewer crash on startup on Mac
...
Minimum window size setting no longer forces propagation to the OS before root view is initialized.
2011-12-02 12:33:51 -08:00
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
ff32ef773b
fix for crash on startup (font system not initialized when first creating fonts)
2011-11-29 23:53:28 -08:00
a16bc265da
build fix
2011-11-28 22:30:57 -08:00
d089e6c264
bumped up MSVC warning level to 3 to catch more stuff that gcc catches
2011-11-28 19:16:49 -08:00
f5159294f1
build fix
2011-11-28 15:21:01 -08:00
20221c8e77
EXP-1485 FIX -- Viewer should have a minimum size
...
moved min size logic into LLWindow
2011-11-28 12:51:15 -08:00
b69be18d7b
merge changes for vmrg-193
2011-11-24 06:56:57 -05:00
91c1161781
Merged with default tip (Revision 18f8fcca93b2)
...
--HG--
branch : RLVa
2011-11-13 00:29:16 +01:00
9ee3974b76
Merged with default tip (Revision 18f8fcca93b2)
...
--HG--
branch : Chat-NearbyChat
2011-11-12 16:37:57 +01:00
e4e4977f5e
EXP-1527 FIX Debug values for windowwidth and windowheight can be set below minimum required values
...
and
EXP-1528 Launching viewer with a settings.xml file with windowwidth and windowheight set below minimum values, launches to those values not minimum window size
2011-11-11 12:29:04 -08:00
76bd8cee11
SH-2644 Fix debug display that shows selection triangle count and streaming cost
2011-11-10 14:48:48 -06:00
aa8f3d3070
SH-2644 WIP -- remove debug displays pertaining to upload/download queues
2011-11-10 10:04:44 -06:00
6b516b7a6c
merge changes for vmrg-182
2011-11-08 15:59:50 -05:00
2ae2d34bdb
Merged with default tip (Revision 9e390d76807f)
...
--HG--
branch : RLVa
2011-11-07 16:11:42 +01:00
866eeb7897
Merged with default tip (Revision 913d90c3225b)
...
--HG--
branch : RLVa
2011-11-04 17:40:17 +01:00
caee90cf4c
Merged with default tip (Revision f2e17425d895)
...
--HG--
branch : RLVa
2011-11-04 11:46:25 +01:00
65e144d9fe
STORM-1580 WIP Initial commit for PO review.
2011-11-02 19:05:13 +02:00
e3287fbe4c
EXP-1500 : Hide the toolbars whenever the login box is shown. Also clean up some old FUI debug that is not necessary anymore
2011-11-01 15:51:33 -07:00
480808d5f3
Merged with default tip (Revision 913d90c3225b)
...
--HG--
branch : Chat-NearbyChat
2011-10-27 16:49:31 +02:00
e2b52009ea
merge
2011-10-24 15:32:58 -05:00
f5197b6158
merge with viewer-dev
2011-10-21 14:41:24 -07:00
aa2ea71412
merge changes for storm-1581
2011-10-20 16:45:31 -04:00
492c93369c
EXP-1426 FIX Voice Settings floater button has label Nearby Voice and tool tip with label nearby voice
2011-10-19 17:25:45 -07:00
f19f43c746
merge
2011-10-19 16:21:18 -05:00
62d9db2f21
Automated merge with http://hg.secondlife.com/viewer-development
2011-10-15 18:14:23 -07:00
b07fa1d11b
Merge with head
2011-10-14 16:04:20 -07:00
984feefbec
merge
2011-10-14 17:56:55 -05:00
7bc1eaf22f
EXP-1342 FIX -- Update avatar picker and destination guide urls
...
* URL's are in place with the [GRID_LOWERCASE] used in the link to go to the
proper page based on the grid.
* Added "GRID_LOWERCASE" substitution for URL's since it is case sensitive
2011-10-14 15:22:53 -07:00
bfda156022
merge with head
2011-10-14 15:22:10 -07:00
aa7245fa2b
EXP-1361 FIX -- Repositioning Viewer Window on mac triggers click to walk
...
* Mouse clicks outside the root view are now discarded before they can cause problems.
Reviewed by Richard
2011-10-14 11:46:38 -07:00
9f682772d9
EXP-1323 FIX Mouselook text "Press ESC to return to World View" overlaps with bottom toolbar if mode is icon only
...
fixed popping out of mouselook when turning off UI
2011-10-13 20:45:50 -07:00
8e3717e187
EXP-1323 FIX Mouselook text "Press ESC to return to World View" overlaps with bottom toolbar if mode is icon only
...
hide toolbars in mouselook
hide top_info_bar when hiding UI
disable mouselook when hiding UI
fixed layout of more button in navigation bar
2011-10-13 20:31:41 -07:00
bdf6363e6a
EXP-1282 FIXED Bottom bar removed.
...
- LLBottomTray code and XUI removed.
- "Speak" buttom which resided in Bottom bar removed.
- Voice connection status update moved from LLBottomTray to LLVivoxVoiceClient.
2011-10-14 01:07:16 +03:00
7b6723d1e0
SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs
2011-10-13 01:19:45 -05:00
a1f0101ca2
EXP-1275 WIP A UI element or Keyboard shortcut to clear the viewport
...
restores hidden floaters now
2011-10-12 13:50:20 -07:00
d0cda13235
EXP-1275 FIX A UI element or Keyboard shortcut to clear the viewport
...
Ctrl+Shift+U now toggles UI and hides floaters
refactored main_view.xml
made all members of llviewerwindow private
2011-10-11 22:49:00 -07:00
9273459251
EXP-1285 FIXED Chiclets moved to the upper right of the viewer window.
...
- Floaters dock to chiclets at the bottom.
- Floaters docking region limited to non-toolbar view.
- Chiclet bar is positioned between the right toolbar and the minimized floaters stacked at the top left corner by default.
2011-10-10 17:09:46 +03:00
23205bb535
EXP-1274 Create floater for "Avatar Picker" content
2011-10-06 17:18:49 -07:00
11a0d0cd59
merge
2011-10-05 15:12:07 -07:00
6f9ed8b303
EXP-1273 Add floater for "Destinations" content
2011-10-05 15:09:04 -07:00
e61da05739
merge with viewer-development
2011-10-05 13:01:29 -07:00
Nicky