c97ddff395
merge changes for storm-1863
2012-05-30 14:24:47 -04:00
dd0c04b864
merge changes for storm-1860
2012-05-30 14:09:35 -04:00
dbac37dcb5
merge latest viewer-release
2012-05-26 16:12:33 -04:00
b2b446aed7
Added tag viewer-release-candidate, 3.3.2-release for changeset 675668bd24d3
2012-05-24 10:01:24 -04:00
dd0094ada4
Added tag 3.3.2-beta2 for changeset 675668bd24d3
2012-05-22 05:39:57 -04:00
fba67959fe
merge changes for DRTVWR-150
2012-05-22 05:39:14 -04:00
a254d0e9b0
Added tag 3.3.2-beta1 for changeset d29a260119f8
2012-05-22 05:37:35 -04:00
93c68c7c12
MAINT-959 FIX [PUBLIC]Trouble resizing tabbed floaters
...
don't auto position other floater when it is hosted
2012-05-18 21:03:45 -07:00
dd5d7fadca
STORM-1860 Remove obsolete code and file(s) for mesh model upload wizard
2012-05-18 12:12:42 -04:00
aa0a0542a1
merge changes for drtvwr-142
2012-05-04 14:58:24 -04:00
a7454671b4
merge changes for drtvwr-140
2012-05-04 12:44:22 -04:00
790dfda434
merge changes for storm-1820
2012-05-01 13:27:34 -04:00
0248aa5ec2
merge changes for storm-1839
2012-05-01 13:27:02 -04:00
5d92c60a4a
merge changes for storm-1842
2012-05-01 13:26:20 -04:00
bea4733193
STORM-1842 Change variable setting from TRUE to true
2012-05-01 12:19:00 -04:00
63e51c586f
merge changes for drtvwr-140
2012-04-26 14:46:49 -04:00
79a24d5d51
merge changes for wolf-318
2012-04-25 19:35:23 -04:00
784ec58401
MAINT-813 FIXED crash when trying to access the region info after viewer disconnect.
...
Added checks for LLViewerRegion pointer in LLViewerObject being invalid.
2012-04-26 00:40:42 +03:00
b18d21486a
Try to suppress spurious Mac ld warnings (lib/release/Release dir).
...
Mindful that some autobuild packages populate only packages/lib/release
(rather than packages/lib/debug), Linking.cmake always appends
packages/lib/release to CMake's link_directories() directive. But since CMake
always appends CMAKE_BUILD_TYPE to those directories, we end up with a phantom
packages/lib/release/Release directory on the search path. This would be
harmless except that the Mac's 'ld' command produces a warning. These warnings
quickly make TC's "Important Messages" output useless. Try appending
packages/lib/release only when the build type isn't already Release.
2012-04-25 17:17:08 -04:00
92ae8c8472
WOLF-318: change default verbosity of some unit tests to keep them out of the logs when passing
...
WOLF-363: (partial) correct ordering of cleaning build dir vs running
'autobuild install'
2012-04-25 16:45:24 -04:00
080c9faf5e
FIX INTL-96 Viewer translation for Set31
2012-04-24 11:51:45 -07:00
3d8d8b6dee
sync with viewer-development
2012-04-24 11:40:57 -07:00
9b87cfbc91
merge back tags for 3.3.1-release
2012-04-24 11:36:12 -04:00
1b832eaa4b
OPEN-54: correct JsonCpp include path
2012-04-24 11:24:11 -04:00
d6569db352
Added tag viewer-release-candidate, 3.3.1-release for changeset c623bbc854b6
2012-04-24 08:38:38 -04:00
19e0cc93a8
DRTVWR-139: merge back 3.3.1-beta2 fixes
2012-04-17 13:47:31 -07:00
ee1124e1c0
Added tag viewer-beta-candidate, 3.3.1-beta2, DRTVWR-139 for changeset 1dc545e44617
2012-04-17 13:42:53 -07:00
c104c887c5
Mac build fix.
2012-04-17 17:36:22 +03:00
e627a5f8dd
sync with viewer-development
2012-04-16 16:16:18 -07:00
3ccda1f285
MAINT-922 FIX Client side code to catch the SCRIPT_PERMISSION_TELEPORT request from similator and display a notification
...
Reviewed by Simon
2012-04-16 14:29:32 -07:00
ee87fd975f
DRTVWR-136: Remove redundant remove_(item|category)() functions.
...
Incoming changes from two different project repos left viewer-development with
LLInventoryModel::removeItem() and removeCategory() plus free functions
remove_item() and remove_category() in llinventoryfunctions.cpp.
remove_category() was actually the better implementation; migrated its body
into LLInventoryModel::removeCategory(). Clearly the previous state of affairs
-- with LLInventoryModel::removeItem() plus a remove_category() free function
in a very different source file -- fooled two different developers into
overlooking the other of the pair. Unfortunately we each added different
"missing" functions, leaving us with a complete set of four.
Fix existing references to remove_item() and remove_category() free functions.
2012-04-14 22:23:24 -04:00
11bbd7e10e
gratuitous change to force new codeticket number
2012-04-14 08:19:07 -04:00
a56424d078
fix merge conflict in remove_item
2012-04-13 20:57:52 -04:00
f79b775fcc
merge changes for drtvwr-136
2012-04-13 20:55:47 -04:00
8d0c73dfd4
Touched a file to fix the TC build.
2012-04-14 00:54:59 +03:00
c7c7726c6f
merge changes for drtvwr-135
2012-04-13 17:11:19 -04:00
dd012cc375
CHUI-87 FIXED crash in handling notifications after viewer disconnect.
...
Notification handlers now use LLHandles to screen channels.
2012-04-12 23:09:47 +03:00
7ef7bbef65
MAINT-891 FIXED Disabled focus return from modal dialog after viewer logoff.
...
Fixed boost trackable objects usage.
2012-04-12 23:09:32 +03:00
753e8673c3
merge changes for drtvwr-137
2012-04-11 16:23:31 -04:00
2b0318ffd0
STORM-1842 Don't save per-account settings if login not fully successful
...
Repo created from Firestorm patch by Jonathan Yap
2012-04-10 16:01:46 -04:00
8d4c6771fd
storm-64: One more toast on failure to verify initial image, and changed a bool to enum
2012-04-10 09:28:47 -04:00
7e97368fe4
FIX VWR-28730 JA terminology consistency fix
2012-04-09 16:43:26 -07:00
4ff8067aa8
STORM-64: Added toasts to display critical errors during update cycle.
2012-04-09 17:44:27 +03:00
0539de9099
STORM-1837: check for valid png header before attempting to decode
2012-04-06 14:36:58 -04:00
9df3afc1ef
STORM-1839 Banlines need to be extended from 768 meters to 5000 meters now that explicit ban height has been changed.
2012-04-06 09:48:54 -04:00
2ed386e07b
STORM-1787 remove dead code that causes spurious build log error reports
2012-04-04 09:17:58 -04:00
973bc1d174
STORM-1828 Change write to location from LL_PATH_CHARACTER to
...
LL_PATH_USER_SETTINGS. This will allow a common write location for development
and installed configurations. Should correct installed configuration from
permission failures on windows systems where writing to the install directory
requires elevation of rights to administrator.
2012-04-03 20:25:49 -05:00
999e0bcc2c
merge fix for storm-1833
2012-04-06 10:15:01 -04:00
e478204526
STORM-1833 Square char is presented in list of recompilation for script with error
...
Subtask of STORM-637
2012-04-06 09:04:51 -04:00
fa6add3fcd
merge changes for drtvwr-132
2012-04-03 11:28:56 -04:00
Oz Linden