Commit Graph

24594 Commits (2a0d7acccf7aafc8a460eb2f46bfc9f42106e56d)

Author SHA1 Message Date
Oz Linden 5a563069e8 merge back more late beta fixes from 3.3.4 2012-07-09 12:45:22 -04:00
Oz Linden f7f27e4f26 Added tag 3.3.4-beta3 for changeset a8057e1b9a12 2012-07-09 12:42:16 -04:00
Oz Linden 690f985a9c merge changes for DRTVWR-177 2012-07-09 11:41:47 -04:00
Oz Linden 1b109f80b9 tag merge of DRTVWR-177 2012-07-09 11:41:22 -04:00
Oz Linden 9298b1abe9 merge changes for DRTVWR-176 2012-07-08 18:36:15 -04:00
Oz Linden ed21e67a38 merge changes for DRTVWR-176 2012-07-08 17:21:06 -04:00
Oz Linden e1c99ab9db merge up to latest integration branch 2012-07-08 16:45:45 -04:00
Oz Linden 13f7afbd7d merge changes for DRTVWR-176 2012-07-08 16:39:54 -04:00
Oz Linden 02bb54273f tag merge of DRTVWR-176 2012-07-08 16:39:03 -04:00
Todd Stinson 7a61717d87 Updating to the latest llphysicsextension library pre-built package. 2012-07-06 17:10:12 -07:00
Todd Stinson b96dd877eb Updating to the latest pre-built llphysicsextensions package. 2012-07-06 16:07:50 -07:00
callum 51f740ca8d MAINT-1228 FIX Can not put more than one object into the contents of an object
Reviewed by Paul PE
2012-07-06 11:31:37 -07:00
Todd Stinson bec4708fba Adding the pathfinding attributes to the object profile panel. 2012-07-05 17:54:04 -07:00
Todd Stinson 3aeb517b91 Updating to the latest llphysicsextension library pre-built package. 2012-07-05 17:02:52 -07:00
Oz Linden 702e6815ed partial changes for building with the llphysicsextensions source package 2012-07-05 12:16:48 -04:00
Oz Linden 92fb006835 update llphysicsextensions source and stub packages 2012-07-05 12:16:02 -04:00
Oz Linden 21ee5f8d41 successful build with llphysicsextensions stub 2012-07-05 09:39:21 -04:00
Oz Linden 1cad2d9de2 update to 20120702 build of havok 2012-07-05 06:33:47 -04:00
Oz Linden 14f754f160 begin integrating building of llphysicsextensions from source here (incomplete) 2012-07-05 06:08:34 -04:00
Todd Stinson 0d8f31c6b0 Adding an import for the new RelWithDebInfo build of the physics extensions library. 2012-07-03 16:07:49 -07:00
Oz Linden 652247dc8c PATH-805: guard all uses of sInstance in LLPanelLogin 2012-07-03 16:20:57 -04:00
eli f0fd5525d7 FIX INTL-99 set32 translation for 8 languages 2012-07-03 12:38:47 -07:00
Todd Stinson e8f0e00628 Updating to the latest pre-built llphysicsextension package. 2012-07-03 10:55:59 -07:00
Oz Linden 619e0b9a35 remove some cmake output that is no longer needed 2012-07-03 09:36:38 -04:00
Oz Linden e575a0ef04 merge up to latest pathfinding project viewer 2012-07-03 05:50:31 -04:00
Oz Linden d59715d6f1 PATH-802: fixed check for different grid in chat SLURLS 2012-07-03 05:48:54 -04:00
Oz Linden ed5b46c9b0 merge back changes from 3.3.4-beta2 2012-07-02 12:38:07 -04:00
Oz Linden 770d8b0d01 improve logging of invalid grid definitions, prevent clashes with old viewers 2012-07-02 11:14:13 -04:00
Oz Linden 9b1208e495 disable alignment tests in debug builds (where they fail) 2012-07-02 10:18:38 -04:00
Oz Linden 077e851bdd Added tag 3.3.4-beta2 for changeset 82b5330bc8b1 2012-06-30 06:12:06 -04:00
Todd Stinson a6fab91181 Ensuring that the code and tests build correctly when HACKED_GODLIKE_VIEWER is defined. 2012-06-29 18:14:37 -07:00
Todd Stinson 9366a7775c PATH-797: BUGFIX Altering how the rows are being added to the scrolllist widget to avoid a regression that occurred after merging from viewer-release recently caused the time to load a large number of elements to increase substainally. 2012-06-29 17:36:40 -07:00
simon@Simon-PC.lindenlab.com 08c6c5b78d Added test back in, skip() call need to be removed. 2012-06-29 14:30:44 -07:00
Oz Linden 0fff60b3c9 merge changes for DRTVWR-174 2012-06-29 16:24:16 -04:00
Oz Linden a49a47def6 tag merge of DRTVWR-174 2012-06-29 16:24:04 -04:00
Oz Linden 595b49b938 merge changes for DRTVWR-173 2012-06-29 16:15:24 -04:00
Oz Linden a6b5b4322c tag merge of DRTVWR-173 2012-06-29 16:15:11 -04:00
callum 11686a0917 Merge with viewer-beta 2012-06-29 10:36:04 -07:00
Todd Stinson 1bf7c4b645 Ensuring that the Show in Linksets and Show in Characters right-click menu option is only show on pathfinding-enabled regions. 2012-06-28 16:37:33 -07:00
Todd Stinson fcc810c67d Ensuring that the linksets filters are cleared before attempting to select an object from right-click in-world menu. 2012-06-28 16:09:11 -07:00
Todd Stinson c57d00ddfa Removing the SERVER_SIDE_OWNER_ROLLOUT_COMPLETE ifdef. 2012-06-28 15:57:29 -07:00
Todd Stinson 685a672b74 Cleaning up new files in preparation for merge into viewer-release. 2012-06-28 15:37:55 -07:00
Oz Linden 326634e1bf Added tag 3.3.4-beta1 for changeset f91d003091a6 2012-06-28 15:41:09 -04:00
Dave Parks db5d1b851a merge 2012-06-28 13:50:35 -05:00
Dave Parks ed72fd0ae9 merge 2012-06-28 13:22:04 -05:00
Todd Stinson df40282058 Updating to the latest pre-build llphysicsextensions package. 2012-06-27 18:38:06 -07:00
Todd Stinson fa562d19cf Removing unreferenced methods from the LLRenderNavPrim class. 2012-06-27 18:12:57 -07:00
Dave Parks 7f38f620fd MAINT-1204 Fix for crash on selecting a texture anywhere other than the build tools. 2012-06-27 17:16:59 -05:00
Kelly Washington a68c7c27f9 Merge pulled in lindenlab/viewer-beta to kelly_linden/maint-1078 2012-06-27 14:43:10 -07:00
Todd Stinson edf5a3f8f6 Minor changes to pathfinding-specific wordings. 2012-06-27 14:22:08 -07:00