5870788f68
catch a few more cases of STANDALONE -> USESYSTEMLIBS
2014-04-22 16:08:13 -04:00
d00d37d23b
merge changes for OPEN-199
2014-04-22 16:03:35 -04:00
6c8bddca3d
merge changes for STORM-1915
2014-04-22 16:01:45 -04:00
90d7e9ba8c
merge changes for STORM-2023
2014-04-22 15:59:28 -04:00
ae564140c0
Merge
2014-04-22 12:19:28 -06:00
b4ca93cadc
merge up to 3.7.6-release
2014-04-22 13:05:26 -04:00
cd382d08c8
add Cinder Roxley to contributors for STORM-1831
2014-04-22 13:04:36 -04:00
331663458f
MAINT-1344 FIXED Attempting to move a folder or item, to another folder in a different inventory window found via inventory search, fails.
2014-04-22 19:27:25 +03:00
d0eb9658f2
merge
2014-04-22 11:19:58 -04:00
883467a3cc
Merge downstream code
2014-04-21 15:37:02 -07:00
676bad148a
Pull and merge DRTVWR-364
2014-04-21 15:35:26 -07:00
b1a7137ba6
merge changes for 3.7.6-release
2014-04-21 16:21:31 -04:00
a5a0a0b136
Merge downstream code
2014-04-21 12:48:50 -07:00
0b9a777bfd
Merge downstream code updating version to 3.7.7
2014-04-21 12:36:35 -07:00
c71e459bed
increment viewer version to 3.7.7
2014-04-21 14:50:54 -04:00
d05f620c55
Added tag 3.7.6-release for changeset d029faf69f20
2014-04-21 14:50:53 -04:00
54d392c4ff
Another oops windows build fix.
2014-04-21 12:07:46 -06:00
3dc1b32bf3
Windows build fix.
2014-04-21 09:33:21 -06:00
1dad526a5c
Reinstate support text appendText() in LLFloaterAbout
2014-04-18 23:25:21 -06:00
46627b4eb2
Remove clearHighlights()
2014-04-18 23:20:33 -06:00
dcffb97518
Move some more script editor functions from LLTextEditor to LLScriptEditor
2014-04-18 23:13:57 -06:00
54c7b96bf1
Fix header guard
2014-04-18 22:03:05 -06:00
1173dde898
Remove calls to now unused methods
2014-04-18 21:05:20 +00:00
b533844945
STORM-2023: Restore system color picker on OSX
2014-04-18 20:06:39 +00:00
9ec900c3c4
Trivial typo fix
2014-04-18 12:53:19 -06:00
8c39617c9a
Begin moving script editor portions of LLTextEditor to their own derived class.
...
This should fix the run off segment bugs by not overriding LLTextBase::clearSegments() in LLTextEditor
TODO: Move the rest of the script stuff out of LLTextEditor for simplicity sake
2014-04-18 12:52:07 -06:00
3c1674f786
Undo of overzealous removal.
2014-04-16 11:08:52 -07:00
20a7d749cf
Orphaned definition
2014-04-16 11:52:46 -06:00
0039e80d7c
bool not U32
2014-04-16 11:52:27 -06:00
f8874d04b8
Linux/Win: Bad checksum on Windows package. Libz and libpng linking changes to find newest code.
...
Windows autobuild package had a bad checksum due to oddities in the build
system. On Linux I've been fighting with getting libz 1.2.8 and libpng
1.6.8 to be the definitive version in the viewer. Problem is the *massive*
library search tree we assemble. We find older shared library versions
first and so those dominated. By using --whole-archive with static libraries,
the packaged versions of these libraries are made definitive.
2014-04-15 22:48:52 +00:00
a39c5926fc
maint-5707 window should no longer be displayed.
2014-04-15 14:57:47 -07:00
13727121a5
Disabled 'Sending to server Try N' messages from crash reporting.
2014-04-15 10:35:40 -07:00
e9976b07f9
Merges in fix for Maint-5707
2014-04-15 10:32:13 -07:00
29e0c3b18f
MAINT-3891 FIXED Clearing saved URLs from media URLs list causes mouse cursor to spin constantly until relog.
2014-04-15 15:10:06 +03:00
0e4e551df5
MAINT-3917 FIXED Don't stop updating self avatar even with disabled avatar rendering.
2014-04-22 13:45:25 +03:00
1a1ac2f9b8
MAINT-3951 FIXED Exclude avatar's uuid before starting conference.
2014-04-22 13:34:02 +03:00
12484cbe5e
Merge downstream code
2014-04-21 15:40:07 -07:00
fdb28bccb9
Merge downstream code
2014-04-21 13:04:07 -07:00
80eafe2ff3
Merge
2014-04-21 12:55:14 -07:00
e5dae42252
Fix for MAINT-5707 bad breakpad behavior with teleport links
2014-04-14 15:11:42 -07:00
04404b68b5
All/Mac: Update libraries to new template builds. Package for static libz/libpng/openssl.
...
Update library dependencies to reference builds using new templates and
modern build hosts for: SDL, c-ares, boost, curl, libpng, llqtwebkit2,
openssl and zlib. Update manifest, library copying and 'test_apps' setup
to reflect that zlib and openssl are now always static (on Mac and
Linux). Viewer and test_apps now functional on 10.7 Mac.
2014-04-14 17:59:00 -04:00
8fd239233d
Merge with head of viewer-releasE
2014-04-14 10:49:18 -07:00
fd2a114d4b
MAINT-1642 FIXED Viewer crashes on double-click on RegionCapabilityRequestError in Notifications Console
2014-04-14 18:57:29 +03:00
4eeff34c65
MAINT-3931 FIXED Don't display any other check marks if Region Settings is selected.
2014-04-15 10:54:15 +03:00
4cf5d945d4
MAINT-3564 FIXED Replace dot before comparing user name.
2014-04-14 11:13:22 +03:00
e72d546fe3
Mac: Update llqtwebkit build, build and package dylib Qt4 pieces.
...
Part of the switchover to dynamic Qt4. This mostly completes the
Mac side. Webkit is functional on Mac, plugins work. The two
test programs, llfbconnectest and llplugintest, need a little
more work to run without manual fixup ('.' on PATH and maybe a
symlink to libz.1.dylib and they run and function on Mac). Also
need to address libz.dylib vs libz.a. Currently resolving against
dylib which is not what I want.
2014-04-11 19:19:22 -04:00
114084bb80
MAINT-3698 Typo is fixed
2014-04-11 16:49:58 +03:00
c1cd375517
MAINT-3698 Typo is fixed
2014-04-11 16:18:32 +03:00
dc44604484
MAINT-4133 FIXED Import llpanelgroupinvite.cpp from viewer_lion to voorhees_groupban: import of changes for MAINT-3846.
2014-04-10 07:05:34 +03:00
7a3859dc48
Import llpanelgroupinvite from viewer_lion
2014-06-10 20:11:30 +03:00
Oz Linden