Commit Graph

30477 Commits (4e0d3bdd4da2bf376bf482f4430e05ba8a6fa01c)

Author SHA1 Message Date
Monty Brandenberg 7443819560 Merge. Refresh from viewer-release after 3.7.0 release 2014-02-11 13:41:31 -05:00
Mnikolenko ProductEngine 52fe667671 MAINT-2754 FIXED Call findInstance() instead of getInstance(). 2014-02-11 13:58:44 +02:00
Merov Linden 2e948a8dc6 Pull merge from lindenlab/viewer-release 2014-02-10 21:07:21 -08:00
simon c0141ac423 Merge 2014-02-10 16:18:27 -08:00
simon 49ade5a719 Pointless merge to make hg happy 2014-02-10 16:16:34 -08:00
simon cb2045fcd5 Merge downstream code with viewer-release 2014-02-10 16:11:50 -08:00
Cho 8d0f7fe571 Hack to fix ACME-1317 2014-02-11 00:09:59 +00:00
simon 4acc2dc273 Merge viewer-release 2014-02-10 15:42:25 -08:00
Oz Linden 413be91cf5 increment viewer version to 3.7.1 2014-02-10 16:00:37 -05:00
Oz Linden b236cdbe8c Added tag 3.7.0-release for changeset 5d746de933a9 2014-02-10 16:00:37 -05:00
Mnikolenko ProductEngine 8e5da5125d MAINT-3710 FIXED List of members is removed from General tab. Title column is added to the list in Members tab. Roles tab is renamed to Roles & Members and Roles sub-tab is default now. 2014-02-10 12:09:32 +02:00
Mnikolenko ProductEngine 1be85e1a0a MAINT-3710 FIXED List of members is removed from General tab. Title column is added to the list in Members tab. Roles tab is renamed to Roles & Members and Roles sub-tab is default now. 2014-02-10 12:09:32 +02:00
Mnikolenko ProductEngine 18deff0723 MAINT-3696 FIXED Show correct tooltip for Highlight Transparent 2014-02-06 17:15:53 +02:00
Mnikolenko ProductEngine ab0fe81dc0 MAINT-3692 FIXED Bindings are added to keys.xml 2014-02-06 15:34:49 +02:00
Mnikolenko ProductEngine 1d9dec5bde MAINT-3657 FIXED Don't change state when other user declines call. 2014-02-06 12:43:58 +02:00
Mnikolenko ProductEngine c938d156aa MAINT-3411 FIXED Sound type is changed. 2014-02-06 12:32:33 +02:00
maksymsproductengine 1033c9d67f MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
simon 52ce788d0c Pull in viewer-lion to lock down next release 2014-02-18 16:41:21 -08:00
simon 54ab932884 Merge viewer-release with 3.7.1 2014-02-14 15:57:27 -08:00
simon 38915f119c More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08:00
simon 6bb9975de1 MAINT-3724 : LLWorld::addRegion logging is misleading 2014-02-14 14:02:34 -08:00
Baker Linden 38c6c55794 merge 2014-02-14 13:57:49 -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
Graham Madarasz (Graham Linden) e7021407cb MAINT-3639 disable ALM for OSX 10.6.8 2014-02-11 10:16:11 -08:00
maksymsproductengine e6c85c46c4 MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
Mnikolenko ProductEngine 16ebc7d133 MAINT-3697 FIXED Login screen help menu is updated 2014-02-05 12:08:36 +02:00
Mnikolenko ProductEngine 3cb2dc6275 MAINT-3484 FIXED Disable menu item if transcript doesn't exist. 2014-02-05 11:43:09 +02:00
Mnikolenko ProductEngine 01535d0808 MAINT-2613 FIXED Remove duplicate entry for "DisablePrecacheDelayAfterTeleporting" 2014-02-03 13:33:54 +02:00
Mnikolenko ProductEngine 294d6777bf MAINT-3671 FIXED Rename title when new tab is added. 2014-02-03 11:53:39 +02:00
Oz Linden 9bb2bc6099 fix odd editor artifact 2014-01-30 14:18:58 -05:00
Monty Brandenberg 80ee8a8ca3 Another build trigger 2014-01-30 13:17:17 -05:00
Mnikolenko ProductEngine 877f7ca131 MAINT-3674 FIXED Menu item text is changed 2014-01-30 14:12:32 +02:00
Mnikolenko ProductEngine 31cc47f9d6 MAINT-3593 FIXED Clear previous selection properly when selecting new item in another panel(Inventory/Inbox). 2014-01-30 12:17:59 +02:00
Oz Linden 32880362fe merge fixes for recording the packages installed in the build 2014-01-29 18:36:01 -05:00
Oz Linden 7b1e1e4e35 FITMESH-6: correct bounds checking 2014-01-29 18:25:03 -05:00
Monty Brandenberg 636953b7d7 another trigger edit 2014-01-29 16:27:59 -05:00
Mnikolenko ProductEngine 31c9be174f MAINT-3664 FIXED Focus filter field in Places floater by default 2014-01-28 16:47:43 +02:00
maxim@mnikolenko da4ef42142 MAINT-3643 FIXED Copy previous search / replace strings in LSL editor 2014-01-28 12:20:41 +02:00
Dave Parks 27044252fc MAINT-3661 Fix for crash when uploading corrupt .dae file. 2014-01-27 16:09:07 -06:00
Monty Brandenberg dae8c4158a Trivial edit to stimulate a new build. 2014-01-27 16:21:56 -05:00
Mnikolenko ProductEngine b4448cf2eb MAINT-3657 FIXED Don't change state when other user declines call. 2014-01-27 11:21:34 +02:00
Aura Linden 57d7cbb837 typo. Yay. 2014-01-26 17:30:02 -08:00
Aura Linden 307290bdbc Debug removal. 2014-01-26 10:02:44 -08:00
Aura Linden 71b1e7bb70 Warn treated as error kills TS film at 11 2014-01-26 10:00:32 -08:00
Aura Linden 352d32934c Merged. 2014-01-26 09:57:33 -08:00
obscurestar 262f8b8473 Was not using correct name for results of file search. 2014-01-26 02:56:23 -08:00
Oz Linden 03d0d46e6f merge fix to the codesign fix 2014-01-24 16:57:55 -05:00
Oz Linden cabd5867b7 merge fix to the codesign fix 2014-01-24 16:41:16 -05:00
Oz Linden cec62b7872 fix error message python boo-boo 2014-01-24 16:39:00 -05:00
Oz Linden eb6bfb9aca merge workaround for build farm Mac code signing failures 2014-01-24 15:06:33 -05:00