48e2ec0340
SH-480 FIX meshes are not added to objects folder on upload
...
curl host scrubbing was causing object creation for mesh prims to fail.
Commenting out the offending lines so we can have a functional release.
Will file a separate bug for Vir to investigate when/if we can re-enable
host scrubbing on these URLs for a future release.
Approach approved by davep.
2010-11-17 20:04:30 -05:00
29a9e9acbb
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-16 14:58:19 -05:00
8f785cba04
SH-432 WIP mac build of mesh-development is broken
...
Was able to rebuild collada and pcre with architecture i386,
which is our officially supported architecture. This should unstick
the build in theory.
2010-11-16 14:58:03 -05:00
80561014b0
merge
2010-11-15 14:22:22 -05:00
f9a35fc4c6
Implemented support for getting at the child translational element if the SID fails to resolved.
2010-11-15 14:02:03 -05:00
26b3b37e87
Backed out changeset: 1c9c6cdcccde
2010-11-15 13:25:59 -05:00
4733f2c438
Implemented support for getting at the child translational element if the SID fails to resolved.
2010-11-15 13:22:04 -05:00
1ec846a94e
SH-396 WIP mac build not working on mesh-development
...
last build of collada didn't have ppc architecture, which is required for
running on 10.4 / 10.5 (was able to build it without ppc when building only for
10.6).
2010-11-15 12:22:13 -05:00
ace36d042e
BUILDFIX allow curl host name scrub to work on non-windows platforms
...
Needed an include for gethostbyname to be called properly.
2010-11-12 17:42:33 -05:00
63466f0eca
SH-331 WIP updating colladadom to work for mac on mesh-development
...
Tried building a colladadom package for mac that will run on both 10.5 and 10.6
fingers crossed.
2010-11-12 16:03:19 -05:00
d682394d02
merge
2010-11-11 11:23:10 -06:00
ce66751403
Fix for crash in curl.
2010-11-11 11:22:35 -06:00
2551bfb1b5
cleanup
2010-11-10 14:46:36 -05:00
0815650c3e
Bug fix for an avatar that would exhibit floating if pelvis was offset
...
Bug fix for attach/detach so that it will recalculate certain avatar settings
based upon bone positions.
2010-11-10 14:43:23 -05:00
bad6aa7f6b
Fix for manual merge errors.
2010-11-08 13:34:24 -05:00
543edbcdc0
Manual merge of llviewerwindow.cpp from mesh-development.
2010-11-08 13:09:15 -05:00
cd09b01906
Backout merge of llviewerwindow; need to do manual merge since this is messy.
...
This checkin causes llviewerwindow to become the viewer-development version.
2010-11-08 13:07:01 -05:00
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
b3ab10923d
SH-396 WIP fix mac opensource build
...
Missed a reference to libcollada in viewer_manifest.
Hopefully should be packaged and set properly now.
2010-11-08 11:49:52 -05:00
3d41e67d7b
BUILDFIX: commented out unused variable which breaks the mac build.
2010-11-05 18:51:43 -04:00
d20412321b
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-05 17:58:32 -04:00
985f4f911e
SH-396 FIX mac build on mesh-development is broken
...
Adding collada to the list of libraries we need to package with the viewer
Not sure why this wasn't here earlier, but this should solve the packaging problem.
2010-11-05 17:58:13 -04:00
69062ccf7b
merge
2010-11-05 17:13:17 -04:00
1c2379becb
SH-396 WIP mac build broken on mesh-development
...
Finally fixed collada dynamic library location issue. Should fix mac build if the library
is being packaged properly.
2010-11-05 16:28:19 -04:00
7318214ed3
merge
2010-11-05 16:17:54 -04:00
ddff1c68f2
additional analysis for --analyzeperformance option
2010-11-05 16:17:24 -04:00
4a80668567
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-05 14:26:30 -04:00
1f9ae081ec
BUILDFIX making curl asserts llinfos for non-windows platforms
...
linux curl appears to throw an initialization error once per session
after login. Can't hunt it down right now, so making curl asserts
llinfos for non-windows platforms. Also added a new assert on curl
initialization.
2010-11-05 14:26:25 -04:00
bbf581726a
SH-396 WIP fix mac mesh-development build
...
Fixed the mac references to Collada14Dom.dylib I think. Fingers crossed!
2010-11-04 21:11:38 -04:00
a2b25828aa
BUILDFIX curl error causes linux build to crash on login.
...
Switching curl errors from llerrs to llinfos allows the client to continue
on its merry way. Will file a jira to follow up later on why the error
happens in the first place.
2010-11-04 17:50:10 -04:00
124a592631
merging up latest changes from viewer-development
2010-11-04 16:27:38 -04:00
fefae4c639
SH-396 WIP fix mac teamcity build for mesh-development
...
making sure we're copying over the necessary 3rd party library in the packaging stage
2010-11-04 16:26:27 -04:00
889aff8d87
automated merge from http://hg.secondlife.com/viewer-beta
2010-11-04 14:44:00 -04:00
3bbaac0b9d
automated merge up from viewer-beta
2010-11-04 14:28:30 -04:00
a788b0a88c
Pushing 2.3.0-beta2 tag to repo
2010-11-04 11:15:51 -07:00
4c5f8bd118
Added tag 2.3.0-beta2 for changeset db0fe9bb6518
2010-11-04 11:11:47 -07:00
29283804ad
merge fix for STORM-450
2010-11-04 11:57:47 -04:00
c97def552a
merge fix for STORM-261
2010-11-04 11:56:36 -04:00
e32ce48d98
merge fix for STORM-194
2010-11-04 11:55:10 -04:00
294fd9c1bc
merge fix for STORM-536
2010-11-04 11:53:53 -04:00
aa6256b089
SH-396 FIX fix mac build on mesh-development branch
...
autobuild recently changed to not upload to s3 without an explicit command-line
argument. Re-uploaded (this time to s3) colladadom for mac, and updated install.xml
2010-11-04 11:11:03 -04:00
c245867569
Automated merge up from viewer-development
2010-11-04 10:32:58 -04:00
211e141444
STORM-450 FIXED Incorrect help contexts for Sidebar People tab
...
- Added checking whether panel is in visible chain instead of just visibility checking
2010-11-04 16:16:18 +02:00
7f0de78558
STORM-261 FIXED Changed line number color in script editor.
...
- Changed text_readonly_color in script editor to darker gray, so that line numbers are visible when scrip editor is out of focus.
2010-11-04 14:24:56 +02:00
ffb8b78ae9
Reverting fix for SH-391 until it works for all use cases
2010-11-03 17:11:08 -07:00
5ca2839612
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-03 19:02:31 -04:00
6c0c1c47e7
SH-396 FIX mac opensource build
...
Trying a new collada package for mac
2010-11-03 19:02:26 -04:00
0a27fe695e
STORM-194 FIXED 'Show' button in inventory offer notification to open 'My Inventory' SP if attachments were offered.
...
Removed the check preventing inventory SP from opening when an item of IT_ATTACHMENT type has been offered.
2010-11-03 23:28:59 +02:00
904738c475
STORM-536 ADDITIONAL FIX Replaced extra calls to getChild() with using a member pointer to LLAccordionCtrlTabHeader.
2010-11-03 22:52:53 +02:00
b66389df89
STORM-536 FIXED scrolling to collapsed accordion tab with keyboard arrows in Places SP->My Landmarks.
...
- Fixed scrolling to selected item when a folder view receives selection inside an accordion tab while being out of visible scrolling area.
- Fixed scrolling to collapsed accordion tab when it receives selection while being out of visible scrolling area.
2010-11-03 22:50:09 +02:00
Nyx (Neal Orman)