Ignored revisions: 12346
included in: 224846
changeset:   17021:deb495300bad
tag:         tip
parent:      17014:fad438c87157
parent:      17020:9f520e38026e
user:        Nyx (Neal Orman) 
date:        Tue Mar 22 20:40:45 2011 -0400
summary:     pulling from mesh development. merge.

codeticket:  224822
included in: 224846
changeset:   17020:9f520e38026e
parent:      17018:8c47d32039e9
parent:      17019:b12d0956380b
user:        Dave Parks 
date:        Tue Mar 22 17:24:10 2011 -0500
summary:     merge

included in: 224822
changeset:   17019:b12d0956380b
parent:      17016:c22d14125a22
user:        Dave Parks 
date:        Tue Mar 22 17:23:48 2011 -0500
summary:     SH-1169 Import from slm instead of dae when appropriate.

codeticket:  224707
included in: 224822
changeset:   17016:c22d14125a22
user:        Dave Parks 
date:        Mon Mar 21 17:31:25 2011 -0500
summary:     SH-1168 Export upload data to disk on upload.

included in: 224707
changeset:   17015:bccd0a9ee188
parent:      17012:59e3083d1e35
user:        Dave Parks 
date:        Mon Mar 21 17:30:26 2011 -0500
summary:     Remove unneeded assertion.

Found Known Changeset:
codeticket:  224689
included in: 224707
changeset:   17012:59e3083d1e35
parent:      17009:92f4bd3e04eb
parent:      17011:b30ead64f4b9
user:        Dave Parks 
date:        Mon Mar 21 10:51:52 2011 -0500
summary:     merge

codeticket:  224712
included in: 224822
changeset:   17018:8c47d32039e9
parent:      17016:c22d14125a22
parent:      17017:96c907674c2d
user:        Xiaohong Bao 
date:        Mon Mar 21 16:40:55 2011 -0600
summary:     Automated merge with http://hg.secondlife.com/mesh-development

included in: 224712
changeset:   17017:96c907674c2d
parent:      17012:59e3083d1e35
user:        Xiaohong Bao 
date:        Mon Mar 21 16:40:23 2011 -0600
summary:     fix for SH-1162: [regression] Mesh Viewer Crashes on Enabling Lighting and Shadows

Found Known Changeset:
codeticket:  224689
included in: 224712
changeset:   17012:59e3083d1e35
parent:      17009:92f4bd3e04eb
parent:      17011:b30ead64f4b9
user:        Dave Parks 
date:        Mon Mar 21 10:51:52 2011 -0500
summary:     merge

included in: 224846
changeset:   17014:fad438c87157
user:        Nyx (Neal Orman) 
date:        Tue Mar 22 20:39:31 2011 -0400
summary:     initial effort to enable a debug display to show render complexity.

Found Known Changeset:
codeticket:  224708
included in: 224846
changeset:   17013:8d7efc8901ce
parent:      16577:95e8a19f051a
parent:      17012:59e3083d1e35
user:        Nyx (Neal Orman) 
date:        Mon Mar 21 17:56:11 2011 -0400
summary:     merge