livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,251 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

22251 Commits (323d27ebcb07fb28ae81ea3728c8ccf65f5ddd68)

Author SHA1 Message Date
Oz Linden 323d27ebcb merge changes for vmrg-216 2012-01-17 10:36:04 -05:00
Oz Linden f6b8bfd3da merge changes for vmrg-215 2012-01-13 09:58:47 -05:00
Oz Linden 6aa48f31c9 merge changes for vmrg-214 2012-01-13 09:58:22 -05:00
Richard Linden f1c2707104 Automated merge with https://bitbucket.org/lindenlab/viewer-development 2012-01-12 13:16:28 -08:00
Richard Linden 26829e6fa2 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/ 2012-01-12 12:54:46 -08:00
Merov Linden 37c68057c9 EXP-876 : Avoid ui elements using the same name reference. 2012-01-11 18:59:35 -08:00
Merov Linden 47a7d27800 Pull from viewer-experience 2012-01-11 17:43:51 -08:00
Merov Linden 33a17d8a83 EXP-1549 : Disable the Remove button menu item in the toolbar contextual menu if no button clicked 2012-01-11 17:43:17 -08:00
callum b41e66c1cb EXP-1511 REFIX Preview image overlays ui elements in Upload image floater 
Tweaked offset and missed a corner case
 2012-01-11 17:15:06 -08:00
Richard Linden daa96009a2 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2012-01-11 10:21:32 -08:00
Richard Linden 3169f4a96f assert for updating views while drawing was too aggressive 
made assert match actual error condition for list iterators

reviewed by Leslie
 2012-01-11 10:19:11 -08:00
eli 4be85a0e3d FIX INTL-89 translation in 8 languages for Set29 including new files 2012-01-10 17:08:20 -08:00
callum 9cdfecd9e1 EXP-1765 (Add debug info) crash on startup at LLWindowWin32::switchContext() 2012-01-10 10:40:27 -08:00
Seth ProductEngine 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
Vadim ProductEngine a47e9bd97b EXP-1525 FIXED Potential fix for a crash at shutdown: added some error handling to saving inventory cache. 2012-01-10 16:35:36 +02:00
callum c4a08e6c9d EXP-1511 FIX Preview image overlays ui elements in Upload image floater 2012-01-09 14:42:34 -08:00
eli 651fdba651 sync with viewer-development 2012-01-09 11:42:04 -08:00
Oz Linden 3dfb1536fa increment viewer version to 3.2.7 2012-01-09 08:41:36 -05:00
Oz Linden 4c5141c567 Added tag 3.2.6-start for changeset 2174ed1c7129 2012-01-09 12:29:39 -05:00
Oz Linden fc00c99532 remove incorrect tag 2012-01-09 12:29:13 -05:00
Oz Linden 1fb6dbbf80 Backed out changeset 4fd359f2f1c3 2012-01-09 12:26:57 -05:00
Oz Linden 41ceee848b increment viewer version to 3.2.7 2012-01-09 08:41:36 -05:00
Oz Linden 8c0023eec4 Added tag 3.6.0-start for changeset a1012611a195 2012-01-09 08:40:42 -05:00
Oz Linden 3763386987 merge changes for vmrg-213 2012-01-08 10:48:26 -05:00
eli f64ad025e8 sync with viewer-development 2012-01-06 15:29:55 -08:00
Richard Linden 757a955bd7 Looking for better fix to EXP-1693 - date localization 
Backed out changeset: 4f3024e9d629
 2012-01-06 12:07:52 -08:00
Richard Linden 377e35af14 looking for better fix to EXP-1695 
[I18N] [INCORRECT CURRENCY LAYOUT/FORMAT] - Currency in
 Group Profile > Land/Asset and New Group (French viewer)
Backed out changeset: c01a6186b15c
 2012-01-06 09:19:10 -08:00
Oz Linden 66555b844d merge changes for vmrg-212 2012-01-06 08:08:55 -05:00
Oz Linden 7b4f3f668b merge changes for vmrg-211 2012-01-06 07:58:35 -05:00
Oz Linden cd103463c0 pull back tags from beta and release branches 2012-01-06 07:58:14 -05:00
Aura Linden bd3a652eab Add capability-based create folder routine for more reliable inventory, with fix for copy and wear 2012-01-06 07:46:53 -05:00
Debi King (Dessie) bf8e113701 merge 2012-01-05 14:37:06 -05:00
Richard Linden 66fcc2da39 Automated merge with https://bitbucket.org/lindenlab/viewer-development 2012-01-05 10:59:29 -08:00
Leslie Linden 9c8f6ba6a5 Modified CRASH assert to not occur in release mode per Richard 2012-01-04 17:37:57 -08:00
Leslie Linden 990b5aea2b EXP-1769 FIX -- Crash in ASSERT (mInDraw == false) - can trigger with selecting build tool 
* Fixed build window to not fail assert at construction time.
 2012-01-04 17:34:11 -08:00
Debi King (Dessie) 7026c80d51 reconciled .hgtags 2012-01-04 17:49:24 -05:00
Debi King (Dessie) b99dfa7d46 Added tag DRTVWR-107_3.2.5-beta2, 3.2.5-beta2 for changeset 65a2c1c8d855 2012-01-04 17:42:40 -05:00
Debi King (Dessie) e326b1e0fa Added tag DRTVWR-106_3.2.5-beta1, 3.2.5-beta1 for changeset 3d2d5d244c63 2012-01-04 17:41:54 -05:00
Xiaohong Bao 4405910caa Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes 2012-01-04 14:15:05 -07:00
Xiaohong Bao 94ad019ce3 fix for SH-2823 and SH-2824: crash in curl: LLBufferArray::countAfter() and LLBufferArray::copyIntoBuffers 
reviewed by vir
 2012-01-04 14:14:23 -07:00
Oz Linden f92fd78e74 merge changes for storm-1790 2012-01-04 10:46:12 -05:00
Oz Linden 23362692e1 merge changes for storm-1708 2012-01-04 10:37:17 -05:00
Ima Mechanique ce6bd89ca4 Changes per Oz's suggestion on RB. 2012-01-04 15:16:35 +00:00
Oz Linden 988cb62d43 merge changes for storm-1727 2012-01-04 10:11:59 -05:00
Brad Payne (Vir Linden) a3e30250e8 merge 2012-01-04 09:59:57 -05:00
Oz Linden d0c7eaa7cf merge changes for storm-1725 2012-01-04 09:33:50 -05:00
Oz Linden 97630acce0 merge changes for storm-1708 2012-01-04 09:32:38 -05:00
Oz Linden 1ce22e0a5d merge changes for latest viewer-development 2012-01-04 09:06:07 -05:00
Paul ProductEngine 377a9ab9ac EXP-1586 ADDITIONAL FIX (Nearby chat window no longer persists between viewer startups) 
- Got rid of confusing conditions.
 2012-01-04 14:50:15 +02:00
Richard Linden 1b1ad93c5d EXP-1512 FIX changing UI size changes cursor position in notecards 
fixed case where adding text between 2 consecutive newlines created gibberish
 2012-01-03 12:21:30 -08:00