dc0b34cf00
Fix for stray tab character breaking the coding standard policy hook.
2010-01-26 15:33:08 -08:00
25ddb4f261
DEV-43688 cycle3 for JA
2010-01-26 15:03:41 -08:00
a87cbadf16
Merge
2010-01-26 14:33:28 -08:00
3f7ed7ef1d
DEV-43688 cycle3 for DE
2010-01-26 14:28:07 -08:00
fee564c26e
Removed tabs.
2010-01-26 13:15:52 -08:00
b2851a9c73
merge
2010-01-26 13:14:08 -08:00
38f4c6981f
Configured build for the windows lightweight(stub) installer.
...
Added a dependency on the package target to get parabuild to build the indra/win_setup project.
Reviewed by Palmer
2010-01-26 13:13:38 -08:00
92f5e24c58
PE Merge.
2010-01-26 12:40:14 -08:00
b77fe6dc72
DEV-45468 SNOW-108: Fast timers are broken / badly-scaled on linux
...
more reliable fix based on feedback from Richard. dicked with the Darwin results too since those seemed wrong based on the same feedback (also covered in test plan).
2010-01-26 12:35:22 -08:00
88a6cbdaec
Workaround for EXT-4725(Viewer crashes if try to call from 'Nearby voice' floater).
...
- Enabling/disabling 'Call'menu item is moved to createMenu(). Some way to properly enable/disable it in
enableContextMenuItem() should be found.
--HG--
branch : product-engine
2010-01-26 22:29:17 +02:00
e33483a7ee
Fixed normal bug EXT-4672 (Relog displays Voice Controls floater with Leave Call button)
...
--HG--
branch : product-engine
2010-01-26 21:38:29 +02:00
3d771ed88b
PE merge.
2010-01-26 10:36:27 -08:00
d72748a0af
Removed an unused class.
...
--HG--
branch : product-engine
2010-01-26 20:19:39 +02:00
dfad0f4e67
Fixed critical bug EXT-4663 ([BSI] Inviting Residents to groups produces error 100% of time).
...
Overriden LLScrollListItem::getUUID() in LLNameListCtrl so that you can get correct ID of a name list item.
--HG--
branch : product-engine
2010-01-26 20:17:45 +02:00
5344f82e28
Fixed normal bug (EXT-4720) N/A is displayed in the Create Landmark panel while data is retrieved.
...
--HG--
branch : product-engine
2010-01-26 20:17:44 +02:00
43bb3d00ec
fixed EXT-4643 “IM toasts don't appear after few teleport offers were sent to that avatar”
...
corrected checking opened active IM session;
corrected restoring active IM session after logging IM notification;
--HG--
branch : product-engine
2010-01-26 18:25:42 +02:00
9936155fb7
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2010-01-26 17:22:41 +02:00
4c82ec8088
implemented EXT-4588 “Redirect messages that went to the Communicate floater”;
...
--HG--
branch : product-engine
2010-01-26 17:22:18 +02:00
e8b4a14b1d
Fixed major bug EXT-4719 - Crash in LLTextBase after showing popup menu for link.
...
--HG--
branch : product-engine
2010-01-26 17:07:12 +02:00
3a0226824b
Fixed normal bug EXT-4718 ( Stop Flying button is displayed in the mouse look mode)
...
- restore base processing of visibility of Panel with "stand/stop flying" buttons broken in EXT-2504
--HG--
branch : product-engine
2010-01-26 17:04:13 +02:00
05b91f636b
Fixed low bug EXT-4354(Dragging landmarks into landmark folders doesn't scroll window)
...
--HG--
branch : product-engine
2010-01-26 16:30:51 +02:00
020f855f64
EXT-4063: Enable tear-offs for pre-login menus.
2010-01-26 14:23:28 +00:00
71d4740251
Fixed EXT-4646 ([BSI] Movement controls close after hitting stand)
...
- reason: fix for bug EXT-2504 (black bars present at top and bottom when in mouselook) (changing parent visibility of panel with "Stand/Stop flying" buttons)
- fix: updated condition to process visibility of the parent of the panel with "Stand/Stop flying" buttons: only if panel is not attached to Move Floater
NOTE: The same problem was for EXT-3632 (Move floater closes after user click on Stop Flying btn)
Reverted that fix for Stop flying button to be consistent with "Stand".
--HG--
branch : product-engine
2010-01-26 16:15:26 +02:00
d53af74ddc
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-01-26 13:24:31 +00:00
0a38adfd8a
EXT-4678: Don't hyperlink sim URLs in About window.
...
Added support for specifying a black list of URLs on a per-widget
basis. URLs on this black list will not be hyperlinked in the text
widget. The About dialog adds the sim hostname to this black list.
2010-01-26 13:09:26 +00:00
aad8a1bd00
EXT-4716: Updated a comment.
...
To say that we must explicitly support secondlife:///app/appearance/show
2010-01-26 10:42:54 +00:00
2bb3a24ca1
EXT-4716: Added new SLapps for Home web content.
...
secondlife:///app/appearance - to open the My Appearance sidetray
secondlife:///app/help/{TOPIC} - to display help for a given topic
I've updated https://wiki.lindenlab.com/wiki/Viewer_2.0_SLapps
2010-01-26 10:40:17 +00:00
cd790bfd54
Update for low bug EXT-4306 - Landmark name is shown with prefix in the group notice attachment.
...
--HG--
branch : product-engine
2010-01-26 10:45:53 +02:00
fbf605ea32
EXT-4712 - Upgraded some 7000 series cards and 9000 series cards from class 2 to 3 for more lights. No code changed.
2010-01-25 17:13:35 -08:00
ef8cb022bb
Merge
2010-01-25 16:41:33 -08:00
b00813ae3c
EXT-4388 Crash in octree line segment intersection code
...
a more complete fix and some sanity to prevent recurrance of a similar problem.
reviewed by bao!
2010-01-25 16:35:50 -08:00
226f64ea79
test change.
2010-01-25 16:14:55 -08:00
dbcb6feb13
Merge
2010-01-25 14:56:09 -08:00
b897406e05
harmless test commit to work with eli.
2010-01-25 14:45:59 -08:00
1edc9af0f3
Merge
2010-01-25 14:41:08 -08:00
cbe647786f
We already have a LL_FORCE_INLINE in llpreprocessor.h, don't re-invent it for llfasttimers.h.
...
Also define LL_LIKELY/LL_UNLIKELY with a warning about its micro-optimizey nature, and use it to annotate llasserts (i.e. make llassert() lower-overhead and thus more attractive, even in inner-ish loops.)
2010-01-25 14:25:58 -08:00
88108c0ae8
test change.
2010-01-25 14:23:47 -08:00
2375afc428
Gosh, the mac prototypes for get_cpu_clock_count_64 have always been wrong, but the compiler didn't start caring until I made these proper member functions.
...
fixed.
2010-01-25 13:49:13 -08:00
18bdeb3d0e
DEV-45468 'SNOW-108: Fast timers are broken / badly-scaled on linux' ready to merge.
...
legacy coding policy fix-up.
2010-01-25 13:32:49 -08:00
9d77473b78
merge.
2010-01-25 13:25:37 -08:00
3d0ff2585e
Final fix for fast timer reshuffle.
2010-01-25 13:24:45 -08:00
ec7b204ed6
shuffle shuffle of timer code. cleanup.
2010-01-25 12:31:50 -08:00
563daa96a8
pull in the linux+solaris fast-timers impl from snowglobe, fit it into viewer2, start moving headers around.
2010-01-25 12:07:25 -08:00
a406c7755e
test commit
2010-01-25 11:56:26 -08:00
471b8f71cd
Merge conflict resolution.
2010-01-25 11:00:46 -08:00
6ff6ed4d11
PE merge.
2010-01-25 10:12:54 -08:00
1d512c599a
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-25 10:05:07 -08:00
af83fe79d8
"Fix" confusion over media settings
...
Review #89
This implements the changes Sam wanted in order to reduce the confusion over media enabled-ness, in particular:
- "Media Enabled" pref now only controls "AudioStreamingMedia"
- No more "tentative" state
- New "Music Enabled" pref
- First run dialog controls Media and Music (Sam, this is a change from your request...I think it works better)
- Put a reflection of the "Media Enabled" checkbox in the Nearby Media Floater
- Get rid of the "AudioStreamingVideo" setting altogether (whatever used it, it should now obey "AudioStreamingMedia").
2010-01-25 10:04:56 -08:00
254b7d72d1
fixed EXT-4601 [BSI] New IM sessions use obsolete timestamps for first message
...
--HG--
branch : product-engine
2010-01-25 18:43:31 +02:00
e3e4a301ab
implemented EXT-4567 [BSI] private voice floaters do not contain standard X buttons
...
--HG--
branch : product-engine
2010-01-25 18:06:01 +02:00
brad kittenbrink