Commit Graph

33744 Commits (7da083e3e64dcd4e851e7ac6539e26e60cf82203)

Author SHA1 Message Date
Merov Linden 7da083e3e6 DD-394 : Make sure Copy and Move to Marketplace menu items are disabled if the Marketplace listing folder doesn't exist 2015-05-02 14:16:26 -07:00
Merov Linden 3748d2f6dc DD-378 : Separate stock items of different permissions in different stock folders 2015-05-01 23:17:05 -07:00
Merov Linden 1717a7edbd DD-379 : React on update for both listing and version folders 2015-05-01 14:28:58 -07:00
Merov Linden 026db0511f Pull merge from lindenlab/viewer-release 2015-04-27 11:14:18 -07:00
Oz Linden fde0868231 increment viewer version to 3.7.29 2015-04-23 16:18:44 -04:00
Oz Linden 5712f7f56b Added tag 3.7.28-release for changeset 566874eb5ab2 2015-04-23 16:17:37 -04:00
Oz Linden 9dbea04a50 remove dead member variables 2015-04-14 17:14:34 -04:00
Merov Linden d631f2fd4d Pull merge from lindenlab/viewer-tools-update (includes viewer-release) 2015-04-14 13:46:01 -07:00
andreykproductengine 11ed48abd1 MAINT-5097 FIXED crash in LLFloaterPay::onGive 2015-04-14 21:21:29 +03:00
Oz Linden d6d13e20f3 remove disabled code 2015-04-14 14:46:32 -04:00
Oz Linden 153d571c5c merge changes for MAINT-5090 2015-04-14 14:42:41 -04:00
Oz Linden a49e11efd9 remove check-viewer-xml (moved to the viewer-test-tools repo) 2015-04-14 10:44:16 -04:00
Mnikolenko ProductEngine 8be5c8eade MAINT-5090 Remove disabling HTTP Inventory from Viewer 2015-04-14 14:10:38 +03:00
Oz Linden 034fb74d05 merge changes for STORM-2113 2015-04-14 05:39:36 -04:00
Oz Linden bef5a95caf minimal changes to compile on Xcode 6.2 2015-04-14 05:00:58 -04:00
Merov Linden 5411f349e5 DD-379 : a 404 on a Get /listing means that said listing is not in SLM, then delete it from the local store 2015-04-13 17:18:01 -07:00
Merov Linden 50805277b3 DD-382 : Use default values on association when version folder is not unique 2015-04-13 15:58:56 -07:00
Merov Linden 637e096d57 DD-388 : More resilient way of reacting to not evaluated stock count throughout marketplace handling 2015-04-13 15:29:56 -07:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Oz Linden a647b8f1cb increment viewer version to 3.7.28 2015-04-13 16:19:04 -04:00
Oz Linden db8d79c90f Added tag 3.7.27-release for changeset afd8d4756e8e 2015-04-13 16:19:03 -04:00
Cinder 5a282abe18 STORM-2113 - uri parsing cleanup and fixes 2015-04-11 15:23:06 -06:00
Merov Linden a9c3681cb5 DD-381 : Avoid unecessary SLM updates, suppress some update_marketplace_category() that are picked by dirty bit setup 2015-04-10 17:37:11 -07:00
Oz Linden 5c6cf3e7fb restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes 2015-04-10 11:02:37 -04:00
Merov Linden 8952e81775 Merge lindenlab/viewer-tools-update 2015-04-09 16:51:02 -07:00
Merov Linden 47a3aecc97 VMM merge 2015-04-09 16:48:27 -07:00
Merov Linden 6877144915 DD-384, DD-388 : Do not trust cached values for stock folders, do not consider a non fetched stock folder empty 2015-04-09 16:47:46 -07:00
Merov Linden 137185c2a9 DD-382 : Activation state should be unchanged when reassigning listing id 2015-04-09 14:28:58 -07:00
Oz Linden 6b9b4c91d1 Detect running under cygwin and fail gracefully 2015-04-09 11:12:47 -04:00
Merov Linden 56b1f3d881 DD-382 : Refactored the auto activate code in create and associate listing. Update count on hand in reassociate correctly. 2015-04-08 23:14:43 -07:00
Oz Linden 1abc87139b fix validity errors in settings files 2015-04-08 13:00:35 -04:00
Merov Linden c5c027eb14 DD-381 : Fix update of count on hand on drop. Will spam SLM a bit but only solution 2015-04-07 22:49:40 -07:00
Merov Linden 19b0fd1fd0 DD-382 : Fix typo resulting in double negative in test and serious bug 2015-04-07 15:43:27 -07:00
Merov Linden 79b891a688 DD-382 : Set count_on_hand correctly when creating or assigning a listing 2015-04-07 15:22:32 -07:00
Oz Linden 8b42c7898e replace llifstream and llofstream with std::ifstream and std::ofstream respectively 2015-04-07 17:59:28 -04:00
Oz Linden 3a57b18896 convert llifstream and llofstream to std::ifstream and std::ofstream respectively 2015-04-07 17:28:05 -04:00
MNikolenko ProductEngine dbb304ab20 MAINT-5023 FIXED URIparser crash in LLUrlEntryBase::urlToLabelWithGreyQuery 2015-04-07 20:58:48 +03:00
Merov Linden 32e5d99c9d DD-291 : Use a heavier but more resilient test for listing updates 2015-04-02 21:40:22 -07:00
Oz Linden 66bc510786 detect xml errors in parsing xml files and remove those files 2015-04-02 21:43:34 -04:00
Oz Linden 4aafdfd1c6 add catch for possible exception in llsechandler_basic destructor (crash on exit) 2015-04-02 21:21:21 -04:00
Oz Linden e19809cb91 improve logging of machine id generation 2015-04-02 21:12:43 -04:00
Oz Linden 6324e58000 improve logging of errors in default permissions cap 2015-04-02 21:11:22 -04:00
Merov Linden 8e11798380 DD-338 : Auto unlist when stock gets to 0 during stock folder manipulation 2015-04-02 14:01:03 -07:00
Oz Linden 136a925536 add script to check xml files written by the viewer 2015-04-02 16:01:17 -04:00
Oz Linden 59e58c9328 improve notice clarity 2015-04-02 15:53:07 -04:00
Oz Linden 77d25204ea clarity and logging cleanup 2015-04-02 15:41:45 -04:00
Mnikolenko ProductEngine e03f1521c8 MAINT-5023 URIparser crash in LLUrlEntryBase::urlToLabelWithGreyQuery 2015-04-02 11:50:17 +03:00
Merov Linden 0118a862fb DD-291 : Fix code path on category update in the SLM update case 2015-04-01 21:54:07 -07:00
ruslantproductengine 90573badb4 MAINT-3585 FIXED (Crashes when attempting to upload image.) 2015-03-30 20:11:27 +03:00
Merov Linden 84b3899af2 DD-291 : Trigger a GET /listing when receiving a category update 2015-03-28 14:32:50 -07:00