Tank_Master
|
e41ca4b4b8
|
merge RLVa update
|
2013-11-11 00:40:45 -08:00 |
|
Liny
|
b71f5ecca1
|
Make debug settings window search textbox focused on opening
|
2013-10-01 16:18:59 -07:00 |
|
Kitty Barnett
|
10a289598b
|
Merged with default tip (Revision 74cc289067c8)
--HG--
branch : RLVa
|
2013-07-21 22:33:04 +02:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Tank_Master
|
d4640277d0
|
Merge LL 3.5.3 release.
|
2013-07-09 16:24:58 -07:00 |
|
Ansariel
|
a505ccf5f3
|
Build fix in llfloatersettingsdebug.cpp
|
2013-06-29 10:43:53 +02:00 |
|
Tank_Master
|
14001c54df
|
Gastly CHUI merge pass 1, don't count on anything to work.
|
2013-06-26 12:14:54 -07:00 |
|
Tank_Master
|
6425b3cd65
|
Merge RLVa SSB update
|
2013-02-24 18:24:48 -08:00 |
|
Kitty Barnett
|
0b8099dc75
|
- internal : hide locked debug settings with LLControlVariable::setHiddenFromSettingsEditor()
--HG--
branch : RLVa
|
2011-05-28 02:36:26 +02:00 |
|
Kitty Barnett
|
7b0455ba0f
|
Merged with default tip (Revision 78d1d228709c)
--HG--
branch : RLVa
|
2011-03-19 16:14:42 +01:00 |
|
Aleric Inglewood
|
42604a1080
|
VWR-24315: update cached control values when resetting debug setting to default
|
2011-01-20 14:35:04 -05:00 |
|
Kitty Barnett
|
1c2ef4090a
|
Merged with default tip (Revision f20bf424bd86)
--HG--
branch : RLVa
|
2010-10-30 17:28:00 +02:00 |
|
ziree
|
a510ca889d
|
Added settings sanity checking system.
|
2011-12-13 00:46:43 +01:00 |
|
ziree
|
334b88465f
|
Debug settings now update in realtime with changes and disabling controls by RLVa commands has been restored.
|
2011-12-09 13:54:35 +01:00 |
|
ziree
|
a21cf7ab22
|
Make debug settings not jump back to first list item on refocus.
|
2011-12-09 00:01:32 +01:00 |
|
ziree
|
d82625d90b
|
Added control name copy to debug settings, typing in search now auto selects the topmost entry, if any, added warning message to debug settings editor.
|
2011-12-08 00:15:08 +01:00 |
|
ziree
|
9f37f6cb46
|
Reworked debug setting to include a fulltext search and not updating once per frame.
|
2011-12-07 18:15:47 +01:00 |
|
Arrehn
|
fa58cafc14
|
Merge from Kitty Barnett's RLVa 1.4
|
2011-08-06 13:59:08 -07:00 |
|
Kitty Barnett
|
e6e551cb41
|
Merged with default tip (Revision 7a739cbdce56)
--HG--
branch : RLVa
|
2010-08-28 02:06:00 +02:00 |
|
Monroe Linden
|
b62b10dd26
|
Post-convert merge by convert_monolith.py from ./viewer-experience
|
2010-08-27 16:58:33 -07:00 |
|
Tofu Linden
|
e416840f85
|
Backed out changeset c3d41f18ce2b
back-out the back-out for this branch. yay.
|
2010-08-24 19:22:00 +01:00 |
|
Tofu Linden
|
98cc236503
|
Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
|
2010-08-24 18:44:39 +01:00 |
|
Tofu Linden
|
6ba23344c9
|
merge heads. whew.
|
2010-08-24 18:37:53 +01:00 |
|
Kitty Barnett
|
b6a073c659
|
Initial commit of RLVa-1.2.0i
--HG--
branch : RLVa
|
2010-08-22 10:57:22 +02:00 |
|
Richard Nelson
|
124bc854dd
|
moved buildFloater out of lluictrlfactory to llfloater.cpp
|
2010-08-16 17:44:23 -07:00 |
|
Oz Linden
|
06b0d72efa
|
Change license from GPL to LGPL (version 2.1)
|
2010-08-13 07:24:57 -04:00 |
|
Richard Nelson
|
566e3969f9
|
deprecated LLPanel::child*() methods
|
2010-07-30 10:02:30 -07:00 |
|
angela
|
433eb89473
|
EXT-3795 First run messages still display (click & drag on map, Build tools open, movement controlled, etc)
|
2010-01-14 09:38:46 +08:00 |
|
David Parks
|
536e38ad51
|
Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
|
2009-09-22 11:11:45 +00:00 |
|
Richard Nelson
|
138bf11322
|
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
|
2009-08-24 20:04:52 +00:00 |
|
James Cook
|
d6101558a1
|
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
|
2009-07-06 21:58:04 +00:00 |
|
Steven Bennetts
|
ade6bbb06c
|
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
|
2009-06-21 17:16:27 +00:00 |
|
Steven Bennetts
|
9ec432034d
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
|
2009-06-21 08:04:56 +00:00 |
|
Dave Simmons
|
24b26d71ee
|
svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
|
2009-03-20 20:00:47 +00:00 |
|
Aaron Brashears
|
e3cf284388
|
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
2009-01-08 00:05:06 +00:00 |
|
Steven Bennetts
|
25c10ed028
|
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
|
2008-06-26 00:39:00 +00:00 |
|
James Cook
|
55c25229b7
|
svn merge -r 83778:83944 maint-ui-10-merge
QAR-442
|
2008-04-03 18:43:54 +00:00 |
|
Steven Bennetts
|
941cb9f412
|
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
|
2008-04-01 17:45:04 +00:00 |
|
Steven Bennetts
|
e3b97ac65b
|
merge release@82383 viewer-cleanup2-7-merge@82828
QAR-369
|
2008-03-20 21:41:26 +00:00 |
|
Steven Bennetts
|
672a76d0ea
|
reverting premature commit at 82410.
|
2008-03-15 01:18:27 +00:00 |
|
Mark Palange
|
04611efae8
|
[NOTE: This was an erroneous commit, and was reverted in the next revision]
QAR-369 - viewer-cleanup2-7 81916 merged into release.
|
2008-03-14 23:21:38 +00:00 |