Commit Graph

18663 Commits (8d47c190886678cb2a92a4a5f033bc53be42befa)

Author SHA1 Message Date
eli_linden f4bee7d771 FIX VWR-25025 en_xui_change 2011-05-23 16:06:24 -07:00
eli_linden de9d7d59b1 FIX VWR-25024 en_xui_change 2011-05-23 14:06:44 -07:00
eli_linden c4d9d061f3 FIX VWR-25023 en_xui_change 2011-05-23 14:05:10 -07:00
eli_linden f94d824e3d FIX VWR-25022 en_xui_change 2011-05-23 14:03:48 -07:00
eli_linden b165e5ad4a FIX VWR-24753 2011-05-23 14:00:15 -07:00
Nyx (Neal Orman) 0ef1364063 STORM-1275 FIX viewer gets caught in infinite loop for decompstub
Fixed setting the initialized flag for the decomposition stub case
(for OS builds) so that the viewer doesn't hang when initializing the stub.

Note that initialized will be set to true even when instance will return NULL.
2011-05-23 16:56:06 -04:00
eli_linden 57a19cf194 FIX VWR-25016 en_xui_change 2011-05-23 13:54:52 -07:00
eli_linden e4467e9964 sync with viewer-development 2011-05-23 10:58:41 -07:00
Nyx (Neal Orman) 294c5f3d3a SH-1616 FIX SL client crashes on startup for debug builds
Added more NULL checks for llconvexdecompositionstub, to avoid
crashing. Clients won't be able to upload meshes using the stub,
but should be able to run the client otherwise.
2011-05-23 12:15:04 -04:00
Oz Linden e5752934be increment viewer version to 2.7.1 2011-05-23 09:16:40 -04:00
Oz Linden f64be5215d Added tag 2.7.0-start for changeset 8835e0e3c0d3 2011-05-23 09:16:01 -04:00
Oz Linden 8f7c287365 merge changes for beta branch tags 2011-05-20 22:51:11 -04:00
Oz Linden 7ef5a015de correct license headers 2011-05-20 17:21:44 -04:00
Oz Linden ecafe4d8ab fix more DOS line endings 2011-05-20 17:19:03 -04:00
Oz Linden 708b2974a9 merge changes for sh-1591 2011-05-20 17:14:32 -04:00
Loren Shih 6f5313caea automated merge mesh-development -> davep-mesh-candidate-2010 2011-05-20 14:56:10 -04:00
prep linden 0b612741d5 SH-1252 and SH-1253 WIP. 2011-05-20 14:26:05 -04:00
Loren Shih 781addcbc1 Automated merge up from viewer-development into mesh-development 2011-05-20 11:41:28 -04:00
Leslie Linden 19a06478d9 SH-1618 FIX -- Lighting and shadows crash ATI macs
* Fixed ATI mac "lighting and shadows" related crash
* Fixed up numerous GL errors on macs related to multiple color formats,
  the use of glEnable/glDisable on textures above the texture unit count
  and old ATI-specific code that was not appropriate for Mac.
* Disabled SSAO for ATI macs due to it not working with shadows
* Ongoing work to properly get shadows and SSAO functioning on ATI macs is required.

Reviewed by davep
2011-05-19 17:28:23 -07:00
eli 385b1ca609 FIX VWR-25021 2011-05-19 16:54:21 -07:00
eli 6ea0e25d3b FIX VWR-25020 2011-05-19 16:53:23 -07:00
eli 358d5e96a2 FIX VWR-25019 2011-05-19 16:52:46 -07:00
eli a76afb5026 WIP VWR-25018 2011-05-19 16:52:08 -07:00
eli 19a1e6f9db FIX VWR-25017 en_xui_change 2011-05-19 16:50:26 -07:00
eli 42256dcf51 FIX VWR-25015 2011-05-19 16:49:33 -07:00
eli 26041278ac FIX VWR-25011 en_xui_change 2011-05-19 16:46:01 -07:00
eli 2ba00f4317 FIX VWR-25010 en_xui_change 2011-05-19 16:44:42 -07:00
eli 5dee1ef57e FIX VWR-25009 2011-05-19 16:43:30 -07:00
eli a1868f841b FIX VWR-24161 en_xui_change 2011-05-19 16:38:48 -07:00
Xiaohong Bao a704394bb5 Automated merge with http://hg.secondlife.com/mesh-development 2011-05-19 17:26:42 -06:00
Xiaohong Bao b1803a8cb9 fix for SH-1185: uploading large mesh file sometimes fails and locks up viewer. 2011-05-19 17:25:42 -06:00
Debi King (Dessie) 5027ee4a8d Added tag DRTVWR-57_2.6.9-beta1, 2.6.9-beta1 for changeset 77e5a08344c9 2011-05-19 18:40:09 -04:00
Oz Linden ce248b92d7 merging head 58e0f8f72d39 2011-05-19 14:42:42 -04:00
Oz Linden 541d6930b5 merging head 7d0ac62a9c94 2011-05-19 14:42:13 -04:00
Loren Shih bd5801ef62 SH-769 FIXED Name field in model dialog allows 255 characters 2011-05-19 13:53:47 -04:00
Oz Linden 1f15b3bdae increment viewer version to 2.7.0 2011-05-19 13:37:42 -04:00
Loren Shih 1c65b8fa44 automated merge mesh-development -> mesh-development 2011-05-19 12:53:18 -04:00
Oz Linden fd427f0ab9 merge changes for storm-1100 2011-05-19 12:26:57 -04:00
Oz Linden 78cad51818 merge changes for STORM-1259 and STORM-1175 2011-05-19 12:07:41 -04:00
Oz Linden 196b4d5704 merge changes for storm-1032 2011-05-19 12:05:34 -04:00
Oz Linden f10384d014 merge changes for storm-941 2011-05-19 11:48:48 -04:00
Oz Linden eb8f5d843f storm-1267 2011-05-18 18:27:17 -04:00
Oz Linden c351b94723 merge changes for login-messages 2011-05-18 18:26:19 -04:00
Oz Linden 35f394cd63 merge changes for storm-859 2011-05-18 18:24:13 -04:00
prep 66554e2124 merge 2011-05-18 15:56:41 -04:00
prep c84e84cfbf Fix for sh-1227. Decoupled avatar in preview window from in world avatar. Code cleanup. 2011-05-18 15:56:24 -04:00
Nat Goodspeed 2414417210 Automated merge with http://hg.secondlife.com/viewer-development 2011-05-18 15:33:17 -04:00
Dave Parks 03f7063c0b merge 2011-05-18 13:58:29 -05:00
Dave Parks 63118cacad Remove extraneous width declaration at behest of eli. 2011-05-18 13:58:12 -05:00
Xiaohong Bao ce554304fb fix for SH-1591: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138 2011-05-18 11:46:55 -06:00