47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
b8e97adced
merge changes for OPEN-39
2011-04-03 09:37:03 -04:00
d0ba2bc847
pull latest changes from viewer-development
2011-04-01 09:52:37 -04:00
2c584790d0
VWR-24487 make PREHASH variables char const* const
2011-04-01 09:14:52 -04:00
8ccf3fbe3b
Automated merge up from viewer-development into mesh-development
2011-03-31 16:40:57 -04:00
a71e0b1862
pull latest changes from viewer-development
2011-03-30 17:37:19 -04:00
b595bbcf2a
merge changes for storm-1019
2011-03-29 19:22:26 -04:00
9c0757511e
merge changes for storm-1077
2011-03-29 19:19:24 -04:00
be545aa51b
STORM-1090 : add attribution for the fix to Nicky
2011-03-23 20:40:35 -07:00
be553242ef
Automated merge up from viewer-development into mesh-development
2011-03-21 10:38:39 -04:00
819c7f0dd2
document contributions from Nicky Perian
2011-03-20 07:48:29 -04:00
abc259618f
merged OPEN-39: include Tut.cmake for integration tests (fixes "bitpack_test.o: No such file or directory" on standalone)
2011-03-19 22:43:33 +01:00
fbd241da54
STORM-1019 Resolve merge conflicts
2011-03-19 16:29:32 -04:00
6ec5177667
OPEN-39: include Tut.cmake for integration tests (fixes "bitpack_test.o: No such file or directory" on standalone)
2011-03-19 21:07:09 +01:00
fef21534e9
OPEN-37 : pull into viewer-autobuild2010
2011-03-18 15:35:20 -07:00
7e3c32308c
merge out 2.6.0 changes from viewer-development
2011-03-18 08:08:12 -04:00
3b1dee9abf
OPEN-1: OPEN-37: Needed changes in autobuild.xml for OpenSource Developers to be able to
...
use VS2010 Autobuild
2011-03-18 08:05:36 -04:00
25b69823e6
merge changes for storm-1064
2011-03-16 21:24:21 -04:00
d9015a836f
STORM-1077 Change "Voice Enabled/Disabled" to "Speak Button"
2011-03-16 18:32:28 -04:00
13705596af
Automated merge up from viewer-development into mesh-development
2011-03-14 12:03:14 -04:00
522af96aca
STORM-1001 : pull into viewer-development
2011-03-11 16:05:27 -08:00
4790944923
STORM-1067 : pull into viewer-development
2011-03-11 16:04:17 -08:00
8c20875323
STORM-1059 : pull into viewer-development
2011-03-11 16:02:40 -08:00
22946d446e
STORM-1073 : pull into viewer-development
2011-03-11 16:01:21 -08:00
d550a7e8bc
STORM-1020 : pull into viewer-development
2011-03-11 15:57:57 -08:00
16443c4df3
STORM-1001 : Fix ObjectMedia cap flooding (Fix by Kitty Barnett)
2011-03-11 15:09:44 -08:00
4223ab9acf
sync up to latest viewer-development
2011-03-11 17:40:31 -05:00
005da00fff
STORM-1059 : Fix for cache purging (fix by Aleric)
2011-03-11 14:38:09 -08:00
c790866e46
Corrected a call to the mac-specific command "Rez" that had the wrong case. This is only an issue on Macs that have a case-sensitive root filesystem.
2011-03-10 12:06:59 -08:00
65bdb53753
STORM-1064 People sidebar panel elements have inconsistent widths and map is slightly too tall
2011-03-10 06:44:03 -05:00
c8293e29ca
Automated merge up from viewer-development into mesh-development
2011-03-09 11:24:54 -05:00
cd3b76cb52
STORM-10140 : pull into viewer-development
2011-03-08 16:12:05 -08:00
0bc84cea2e
STORM-990 : pull into viewer-development
2011-03-08 16:07:52 -08:00
be9bae601c
STORM-1045 : pull into viewer-development
2011-03-07 14:31:09 -08:00
4d8244573c
STORM-1040 Text that shows what Beacons you are viewing is always in English
2011-03-04 08:46:45 -05:00
0247cd6aeb
STORM-236 FIXED Allow the "Speak" button to be removed, like other buttons.
...
Cumulative diff of changes made by Wolfpup, Richard and me.
Description:
* Ability to hide the Speak button with the bottom tray context menu.
* Made the chat input resize handle visible, so that the feature is easily discoverable.
* Applied Richard's fix to layout panel resizing logic.
2011-03-03 20:49:42 +02:00
64c07135ba
merge up from viewer-development
2011-03-03 07:20:04 -05:00
2ef66a7cfa
STORM-954 : pull into viewer-development
2011-03-01 12:02:14 -08:00
4e3068fcd4
STORM-1024 : pull into viewer-development
2011-03-01 11:53:47 -08:00
f86e112556
STORM-977 : pull into viewer-development
2011-03-01 11:50:12 -08:00
dc3823b629
Automated merge up from viewer-development into mesh-development
2011-02-28 11:05:33 -05:00
513fdff9cd
STORM-990 merge with current v-d & fixed merge conflict
2011-02-25 20:21:54 -05:00
9962560f57
STORM-980 : pull into viewer-development
2011-02-25 15:44:38 -08:00
8976c93b5c
STORM-974 : pull into viewer-development
2011-02-25 15:42:07 -08:00
b9c6c9d273
STORM-979 : pull into viewer-development
2011-02-25 15:39:01 -08:00
5b90db03d7
STORM-1020 It is sometimes necessary to press ALT+CTRL+D twice to get the Debug menu on the login screen
2011-02-23 18:51:29 -05:00
668307e4e3
STORM-1019 Add ability to display beacons for Media on a Prim objects
...
Changes merged into viewer 2 by Jonathan Yap
2011-02-23 15:50:55 -05:00
561e050474
VWR-24917 Use mIsDisplayNameDefault to reduce name redundancy in nearby chat history
...
* Clean up changes based upon feedback from reviewers.
* Improve comment based upon feedback from reviewers.
2011-02-17 20:59:33 -06:00
b1e39f8544
Mesh-development work in progress
2011-02-17 10:26:28 -05:00
bf7801aeec
merging in latest viewer-development
2011-02-16 18:18:34 -05:00
Loren Shih