Commit Graph

42 Commits (d0a51da8942c1908ecad3f718cf620dafd96c511)

Author SHA1 Message Date
Tank_Master 8863d9beaf Compile fixes 2014-06-09 23:27:05 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
simon 2ccebebece More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08:00
Baker Linden a72e34a345 [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
simon 38915f119c More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08:00
Baker Linden d7b902d575 [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden cbe397ad13 changed fast timer over to using macro
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
simon cd8cd8c265 Fix merge oddities 2013-04-12 09:26:59 -07:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Graham Madarasz e8b8a12b73 Mods to make compile on gcc 4.6.3 work mo betta 2013-03-12 10:48:05 -07:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Tank_Master 478de75a95 Merge 2013-07-09 16:48:18 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Cinders efe708ef12 One more time, a new format for script library xml:
*Do not use llsd-xml, use our new format
*Include constants and keywords in the script library, deprecate keywords.ini and remove parsing it
*Readd energy and sleep time values
*Minor bug fixes in llpreviewscript.cpp
2013-07-08 15:01:25 -06:00
Cinders 97afcc1eb5 Rename our ini format to fskeywords and set version 1 so if ll ever feels in inclined to change their format, they don't run us over 2013-05-16 13:46:23 -06:00
Cinders 5b716795ab More changes to keywords.ini:
* Don't read colors from the ini, use LLUIColorTable and let the users and skin artists choose colors
* Define more specific sections in the ini
* Standardize sections to only contain the section name, no readColor() hack!
* Expose color settings for syntax highlighting to the user
2013-05-16 13:28:12 -06:00
Cinders 3ba61041c7 Move OSSL keywords to their own .ini Don't hardcode the preprocessor directives, give them their own .ini to load too. 2013-05-15 20:43:38 -06:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
niel@nirvana-win7hp.planescape.home 42c166e451 STORM-959 Adding syntax highlighting for /* */ style comments 2011-10-26 01:38:29 +01:00
Tank_Master 5ce4e57a29 LSL preproc from NaCL viewer 2012-03-03 20:42:59 -08:00
Tank_Master 8dff6606ae STORM-959 Syntax highlighting for LSL multi-line comments. (from Ima Mechanique) 2011-10-29 21:45:15 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Yuri Chebotarev 6bbe55558f EXT-7623 FIX One more place where text was processed into segments without LLLineBreakSegment.
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/516/

--HG--
branch : product-engine
2010-06-07 12:56:29 +03:00
Monroe Linden 3e8320201f Partial fix for EXT-5071.
Changed the index on the keyword map in LLKeywords so that LLKeywords::findSegments() doesn't have to create LLWString objects to search the map.

Reviewed by Richard.
2010-02-17 18:18:18 -08:00
James Cook eda3831041 skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on script compile when cursor is at the end of the script editor window. Replaced panel_pick_info.xml and panel_profile_view.xml with our versions, which stomped some PE changes. Panels still work, however, and Kurt is still working on layout.
CHANGES:
minor layout change: "start location" and "remember password" weren't on the same horizontal line.

DEV-35120 image_unselected art was "transparent.j2c" - switched it out for PushButton_Off

I18N: more things are missing a.. you guessed it, a name= parameter. Breaks localization.

forgot to check this in earlier...fixes off-by-one crash when editing a script

DEV-36740 change the displayed string per Erica's request re 'You can only set your Home Location...'  VIEWER-SIDE text change.  This does not change the actual message coming from the server

EXT-689 Odd spinner behaviour - For Sale Price -- reviewed by james

DEV-26973 Internationalize the server msg Youcan'tset this place as home -- reviewed by james

EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- reviewed by james

EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- to be reviewed

EXT-655 Cannot choose Both logging options in Preferences -- to be reviewed

Changes to notifications.xml text to fit Style Guide and some renamed menu items

EXT-147 Ongoing revisions to new gestures layout.

DEV-35097 catch more instances of 'SLURL' and make them 'SLurl'

Removed Info Displays and Buy Currency Test from top menus.

Clean up code to use proper childGetFoo and childSetFoo calls, as well as setCommitCallback using slots.

De-inlined LLAvatarIconCtrl paramblock constructor because I was doing a full rebuild anyhow.

Commented about use of childSetCommitCallback().  De-inlined LocalizedString paramblock constructor.

eliminated memory leak

I18N: more things are missing a name= parameter, breaks localization.

EXT-714 Updated panels in sidetray that were not using the scroll_container element to adjust for viewer heights.

fix for llmessage_test crash in Windows Release builds

DEV-11254 I18N: replace all string instances of "Second Life" - do this in the foreign languages too

DEV-11254 I18N: replace all string instances of "Second Life" - found new instances from merged code

potential fix for unit test crash on parabuild, moved statics into singleton member variables to get around potential dual instantation of statics on different modules

DEV-36809 Click target for slider handles is too small -- reviewed by steve

EXT-403 change getChild<LLSpiner> to LLUICtrl to make it generic -- reviewed by richard

DEV-35938 Horizontal scroll thumb too high -- to be reviewed

EXT-386 clean up warnings - initCommitCallback...

Rename Product Engine's LLFloaterMiniInspector to LLInspectAvatar, clean up XUI XML, clean up construction code, move refresh method to postBuild() so widgets are constructed before refresh, fixed a member variable in llavatarlistitem.cpp.  Reviewed with Leyla.

Login menu > Debug > Avatar Inspector shows test avatar inspector.  Also added to main menu > Debug > XUI > Avatar Inspector.  Changed text/layout of dummy inspector.  Not reviewed.

Merging revisions 131558-131975 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-22 into D:\viewer-2.0.0-3, respecting ancestry
2009-08-28 16:51:34 +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
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
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
Steven Bennetts 2e32d44e71 merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
2008-02-19 21:42:32 +00:00
Josh Bell d06e5e3519 svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640
Redo of QAR-170, with correct range. Reviewed by CG.
2007-12-29 01:40:57 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Aaron Brashears 305c74d516 Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00