1785 Commits

Author	SHA1	Message	Date
UbitUmarov	875ca104b8	Merge branch 'master' into httptests	2018-01-05 22:37:42 +00:00
UbitUmarov	89a690c11f	a few more xml things	2018-01-05 12:24:07 +00:00
UbitUmarov	ec6f87d3ef	disable some XmlResolver	2018-01-04 23:51:43 +00:00
UbitUmarov	3576d6d764	Merge branch 'master' into httptests	2018-01-03 10:48:38 +00:00
UbitUmarov	8eea9531ee	fix estates URI	2018-01-03 10:21:07 +00:00
UbitUmarov	ab0f866087	Merge branch 'master' into httptests ... # Conflicts: # prebuild.xml	2017-12-12 22:19:31 +00:00
TomTheDragon	98f90f4eed	Changing map tile colors This change also allows setting the water color, as well as the 4 colors for textured map tiles. ... Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>	2017-11-13 20:43:16 +00:00
UbitUmarov	68e9baf2e0	Merge branch 'master' into httptests	2017-10-13 20:36:29 +01:00
UbitUmarov	59afeb6c4c	remove a dead line of code	2017-10-06 02:43:46 +01:00
UbitUmarov	8520ceed63	mantis 8246: don't allow 'delete object name' to delete attachments, but allow delete object id, with confirmation	2017-10-06 02:40:28 +01:00
UbitUmarov	a1aa2f1add	Merge branch 'master' into httptests	2017-08-24 02:18:40 +01:00
UbitUmarov	c5802c9460	change a few more parcel eject code paths	2017-08-24 01:47:01 +01:00
UbitUmarov	74524cb3be	(un)eject flag is only lowest bit, only protect active gods from freeze; do not check landing point (telehubs) on eject.	2017-08-24 01:30:57 +01:00
UbitUmarov	b1fdb02be1	Merge branch 'master' into httptests	2017-08-22 18:39:30 +01:00
UbitUmarov	1ca70232a5	mantis 8233: media changes flag object updated in region db	2017-08-22 18:37:35 +01:00
UbitUmarov	6d4b0a8ce3	Merge branch 'master' into httptests	2017-08-16 05:05:57 +01:00
Robert Adams	a754ab0e4f	Refactor archive loading to optionally start script engine after loading.	2017-08-14 21:27:53 -07:00
UbitUmarov	6996bab4a1	display remaining pass time in hours, mins or seconds acording to value	2017-07-26 20:13:30 +01:00
UbitUmarov	0b23964349	change buypass insuficent funds to make clear that its on that region money system (buypass now uses the new MoveMoney)	2017-07-26 19:12:12 +01:00
UbitUmarov	0bbe7bab7b	add new funtion bool MoveMoney(UUID fromUser, UUID toUser, int amount, MoneyTransactionType type, string text). this should be called async allowing time for money module to process it. If returns true, the transation did sucess, so if its use was to pay something, the payed item/service must be provided without fail, otherwise another method is needed so a refund is possible	2017-07-26 19:01:11 +01:00
UbitUmarov	a91ceae826	add comments to make that more clear	2017-07-26 14:26:28 +01:00
UbitUmarov	025e82341f	do not allow setting land passes on group owned land, because currently we cant give money to the group	2017-07-26 14:24:21 +01:00
UbitUmarov	74389c74cb	only allow pass renovation on the last quarter of parcel pass time. go back to MoneyMove charging method	2017-07-26 12:58:47 +01:00
UbitUmarov	8739ceb00f	lets try using older EventManager.TriggerMoneyTransfer to pay parcel passes	2017-07-25 04:18:38 +01:00
UbitUmarov	86c9c86eeb	allow pass recharge with no loss of current time up to 1/4 of parcel pass time.	2017-07-25 03:13:03 +01:00
UbitUmarov	c5b34a51fd	Ooops.. pay to land owner, not grid. group owned parcel not suported for now. (the pass already expired with kick action)	2017-07-25 02:39:12 +01:00
UbitUmarov	81d1ebc510	add first code to process parcel buy pass. Still testing, and still no kick on expire ( does expire on entry )	2017-07-25 01:30:35 +01:00
UbitUmarov	13564aa984	only hide parcel info from banned avatars	2017-07-24 22:04:36 +01:00
UbitUmarov	fe6ad384e4	merge	2017-07-20 11:30:12 +01:00
UbitUmarov	aff9c345dd	osSetParcelDetails: add more land update code	2017-07-12 07:27:21 +01:00
UbitUmarov	ef74efeaa7	and add a missing bracket :)	2017-06-26 09:18:31 +01:00
UbitUmarov	e075cf4461	fix bad english	2017-06-26 09:08:23 +01:00
UbitUmarov	191661b51d	a few more changes to iar/oar assets save error/warning to show problems known to be asset errors	2017-06-24 02:01:48 +01:00
UbitUmarov	0a1f497dee	code actually has no ideia if a id is a asset or not and does try to handle all as assets, it really can't report errors. Change messages to make more clear they are only warnings and may mean nothing at all	2017-06-23 19:55:23 +01:00
UbitUmarov	83e443bca1	do the same on OAR saves	2017-06-23 17:48:59 +01:00
UbitUmarov	3c6790b061	several changes to iar/oar assets error reports	2017-06-23 15:50:16 +01:00
UbitUmarov	28caf1e089	actually iar do it for iar	2017-06-22 22:09:00 +01:00
UbitUmarov	cbae148f68	show the count of broken assets we now have from gather on iar/oar pre save information	2017-06-22 21:48:26 +01:00
UbitUmarov	1bfe4da378	do not try to store on oars temporary or in transit objects ( they may be deleted during the save)	2017-06-21 20:15:35 +01:00
UbitUmarov	637d35631c	make oar/iar assets writer be done by caller thread like the rest of the ... oar/iar save. This may look more painfull but should reduce errors and threads fights. Fill lucky i just don't stop the entire simulation during this	2017-06-21 18:40:53 +01:00
UbitUmarov	7d58b73bbc	some changes on pollevent	2017-06-06 21:55:47 +01:00
UbitUmarov	7a82c7c5b2	make BlockingQueue.Dequeue timeouts more coerent (just less than watchdog timeout)	2017-05-26 00:47:08 +01:00
UbitUmarov	928733efc9	please DIE! PLEASE??	2017-05-23 03:26:32 +01:00
UbitUmarov	52dd683326	fix a null ref on parcels join	2017-05-19 18:03:02 +01:00
UbitUmarov	7c9615f000	fix land parcel group been lost on region upload	2017-05-19 17:35:49 +01:00
UbitUmarov	2717ef5da9	change some confusing comands help	2017-05-19 05:34:49 +01:00
UbitUmarov	156707edfb	clear land object on delete	2017-05-14 06:27:29 +01:00
UbitUmarov	92df6095d5	don't round to nearest int	2017-05-14 05:49:01 +01:00
UbitUmarov	f968118e23	don't do dwell if there is no module active	2017-05-14 05:39:22 +01:00
UbitUmarov	9ab8ce1404	fix remote requests for dwell, so dwell module still called	2017-05-14 04:17:48 +01:00