Commit Graph

32836 Commits (4fd175bc314eda71f78670fbb21357ad5ccc33ae)

Author SHA1 Message Date
Merov Linden 4fd175bc31 DD-289 : WIP : Prevent building tabs twice 2014-12-04 22:45:04 -08:00
Merov Linden d1d58fbf25 DD-287 : Use the current tab correctly when creating a new folder. Fixed the sorting to be applied to all tabs as intended. 2014-11-23 20:47:56 -08:00
Merov Linden 072ac0e5a6 DD-286 : We report if a stock folder contains subfolders, we do not count subfolders in stock count and we move subfolders out on drop 2014-11-23 17:04:02 -08:00
Merov Linden 02c5352764 DD-284 : Do not count incoming stock items if dropped in a stock folder 2014-11-23 14:39:01 -08:00
Merov Linden 171b60d068 DD-284 : Do not allow the creation of subfolders in stock folders 2014-11-18 15:46:21 -08:00
Merov Linden 3513633d86 DD-264 : Do not unlist listings when version folder is emptied 2014-11-18 14:54:36 -08:00
Merov Linden 43745ce271 DD-281 : Do not unlist listings that go out of stock 2014-11-16 14:26:33 -08:00
Merov Linden d0afd69152 DD-284 : Separate no copy from copy items when counting items in marketplace listings folders 2014-11-16 13:30:01 -08:00
Merov Linden 4ea33a3b3c Pull merge from lindenlanb/viewer-release 2014-11-11 11:40:19 -08:00
Merov Linden b31f7381ae DD-266 : Use prevalidateNonNegativeS32 instead of prevalidatePositiveS32... Grmbl... 2014-11-10 22:35:24 -08:00
Merov Linden 70a2956f58 DD-276, DD-280 : Serialize update count on SLM by preventing sending update while previous transaction not completed 2014-11-10 22:14:50 -08:00
Oz Linden 2301cf800f increment viewer version to 3.7.21 2014-11-10 14:41:41 -05:00
Oz Linden 3cbba871c2 Added tag 3.7.20-release for changeset 27094824773b 2014-11-10 14:41:41 -05:00
Merov Linden 1461740a68 DD-276 : Let the count on hand be updated locally when updateSLMListing returns with data from the server 2014-11-10 10:30:22 -08:00
Merov Linden 20173c9747 DD-274 : Do not display super long error description (there are in the log though) 2014-11-08 16:07:31 -08:00
Merov Linden 69baff7415 DD-259 : Show only one error when failing on listing, user can see all errors in Check for Errors 2014-11-08 15:09:48 -08:00
Merov Linden 48fd1e2ec0 DD-265, DD-266 : Validate the listing id when associating, show alert if value out of positive integer limit 2014-11-08 13:42:07 -08:00
Merov Linden b5e557b137 DD-258 : Disable the Check for Errors buttons (aka Audit) while the inventory is still fetching 2014-11-08 12:33:57 -08:00
Merov Linden 23a5b43cb9 DD-260 : Silence the SLM delete message so to prevent server notification to show up when deleting or unassociating things from the viewer 2014-11-08 11:48:35 -08:00
Merov Linden 2939a542f9 DD-272 : Be more consistent when updating the count on hand in SLM, also prevent multiple folder update when receiving data from SLM 2014-11-07 16:47:19 -08:00
Merov Linden 1f23a35a2c DD-235 : Use newly built jsoncpp libraries that do include the security fix 2014-11-03 16:28:04 -08:00
Merov Linden 828f478921 DD-263 : Update the count on hand on SLM in various situation where stock count changes (activate, drag/drop, associate, etc...) 2014-11-03 13:18:06 -08:00
Oz Linden 05896f4f04 merge changes for MAINT-4560 2014-10-29 16:15:57 -04:00
Oz Linden cd0774a217 merge changes for 3.7.19-release 2014-10-28 10:01:40 -04:00
Oz Linden 02e2235277 increment viewer version to 3.7.20 2014-10-28 09:55:55 -04:00
Oz Linden 7c0a06f1be Added tag 3.7.19-release for changeset 82973b38a6c9 2014-10-28 09:55:54 -04:00
Merov Linden 0291b82f94 DD-243 : Set up callbacks for merchant outbox importer in the postBuild 2014-10-24 22:46:26 -07:00
Merov Linden b630544159 DD-242 : Added beta invitation message to merchants in the marketplace listings floater 2014-10-24 15:30:50 -07:00
Merov Linden b2c7fb9aee DD-224, DD-246 : Clean up code when receiving delete notification. Display DAMA alert when associating listing 2014-10-23 19:45:48 -07:00
Merov Linden f99dbd9be0 DD-224 : WIP : Add a deleteListing method, call SLM_UPDATE_FOLDER notification if state is deleted 2014-10-21 21:46:16 -07:00
Merov Linden eeb5fb382b DD-221 : Pointer testing to avoid potential crash 2014-10-21 19:34:54 -07:00
Merov Linden 511c776579 DD-220 : Avoid testing folders against marketplace root if we are not filtering against the marketplace 2014-10-21 16:39:55 -07:00
Merov Linden 78e3d40597 Pull merge from lindenlab/viewer-release 2014-10-21 08:46:10 -07:00
Oz Linden 286ed4a4c2 merge changes for 3.7.18-release 2014-10-21 11:25:44 -04:00
Monty Brandenberg 80f93392ea Merge. Refresh from viewer-release after 3.7.18 release. 2014-10-20 15:01:03 -04:00
Oz Linden 920b6de4b1 increment viewer version to 3.7.19 2014-10-20 14:34:53 -04:00
Oz Linden f4a0b8205e Added tag 3.7.18-release for changeset 2729c1daf025 2014-10-20 14:34:53 -04:00
Merov Linden c58af95410 DD-170 : Set the import callback for Merchant Outbox only when clicking the import button 2014-10-19 21:53:07 -07:00
Oz Linden 2188e00d4e update llqtwebkit with fix for MAINT-4585 and MAINT-4586 2014-10-16 10:27:55 -04:00
Oz Linden ecba0d5524 MAINT-4560: turn on display of group title by default 2014-10-15 15:12:37 -04:00
Merov Linden 8ca0ebbb8b DD-170 : Check the Merchant Outbox API and hide the menu item if getting 503. Show SLM always. 2014-10-14 21:32:00 -07:00
Oz Linden 5341e1d389 merge up to 3.7.18 2014-10-13 15:26:50 -04:00
Monty Brandenberg ec4fd2f0e2 MAINT-4564 HTTP Pipelining is not happening in Drano HTTP Phase 4
Incorporate the new libcurl 7.38.0 build with curl bug 1420
workaround.  Add developer-centric testing code to evaluate
the workaround or a future fix for 1420.
2014-10-10 16:43:04 -04:00
Merov Linden dc738f6757 Pull merge from lindenlab/viewer-release 2014-10-06 21:57:06 -07:00
Merov Linden 5ded6ef85b DD-170 : Rename enum for consistency 2014-10-06 21:09:01 -07:00
Monty Brandenberg 99b2d74554 Merge. Refresh from viewer-release after 3.7.17 release. 2014-10-06 15:22:58 -04:00
Oz Linden 788ce7a8cd increment viewer version to 3.7.18 2014-10-06 15:13:41 -04:00
Oz Linden fd5bfc5252 Added tag 3.7.17-release for changeset bcc2770e21c1 2014-10-06 15:13:40 -04:00
Monty Brandenberg f9c73f089a BUG-7454 Viewer crashes while logging with a turned off "HTTP Inventory"
The HttpRequest objects used in inventory ops are created lazily
when needed.  The update() operation didn't protect against their
not being created.  Added some guard tests around the update()
operations and we're good.
2014-10-06 05:44:54 +00:00
Merov Linden 6b8916e760 DD-170 : Handle 503 answer from SLM and added a MARKET_MERCHANT_NOT_MIGRATED state to the UI, showing only the relevant UI to the user (i.e. Merchant Outbox or Marketplace Listings). 2014-10-05 20:17:29 -07:00