Commit Graph

1953 Commits (ebf5b6928324db1066d1963371c4fb0c2003a6ea)

Author SHA1 Message Date
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
UbitUmarov cb21caae77 fix some issue on parcels loading and make parcels dwell show something. Resolution is 2.5min aprox. 2017-05-14 01:44:04 +01:00
UbitUmarov 25ca8695f3 find parcels by GlobalID.. well most time 2017-05-13 20:21:56 +01:00
UbitUmarov d0912b6151 let StreamReader be in using statements 2017-05-07 00:47:45 +01:00
UbitUmarov 3402819888 do the same in the cases we are just moving parts around and not changing their caches (ie their taskInventory) 2017-05-04 12:08:10 +01:00
UbitUmarov d62aed7f46 fix right to change permissions of group owned objects 2017-05-03 21:12:16 +01:00
UbitUmarov 94bb6d965e change taskInventory copy/move to agents inventory rules 2017-05-03 16:03:26 +01:00
UbitUmarov 28d8eda768 buysell: make sure we dont buy child parts, dont mess with absolute position its useless with variable size regions, and its a rezing job 2017-05-01 14:42:38 +01:00
UbitUmarov 60dc124872 rename sog.GetEffectivePermissions() since its use is now limited to more specific task, and no longer on current effective(full) path. Note that change ownermask start to be current ownermask, and filter it to all parts basemask 2017-05-01 14:18:59 +01:00
Melanie Thielker cf1064a245 Add a missing viewer-relevant message to the perms module 2017-04-30 13:24:48 +01:00
UbitUmarov d8341588b3 nore permissions masks hierachy 2017-04-29 23:59:56 +01:00
UbitUmarov fedd1a93d2 buysell: fix permissions masks hierachy 2017-04-29 23:09:32 +01:00
UbitUmarov 522695c821 update folded permitions if taking from world, or after unfold 2017-04-29 22:09:45 +01:00
UbitUmarov 04117d9f75 recover PermissionsUtil.ApplyFoldedPermissions (well my version). its use easys code readability 2017-04-29 19:07:04 +01:00
UbitUmarov 019b34ea39 BuySell: bug fix, use all object permitions for sold item, and not the operation rights one 2017-04-28 23:05:14 +01:00
UbitUmarov eb11505d19 add bool CanObjectEnterWithScripts(SceneObjectGroup sog, ILandObject land) permissions check 2017-04-03 16:10:05 +01:00
Melanie Thielker b033a2559e Adapt to a variable name that has changed in core 2017-03-31 14:55:54 +01:00
Melanie Thielker 5587ee4500 Merge branch 'melanie' 2017-03-31 14:50:14 +01:00
Melanie Thielker a6ecedb72a Also ignore NPCs in short-circuiting region restarts 2017-03-31 14:38:42 +01:00
Melanie Thielker 3e880cee45 Allow short-circuiting region restart delays of there are no users left 2017-03-31 14:38:41 +01:00
Melanie Thielker 27fdf3094d A god is a god is a god. Let gods access scripts and NCs
Support staff are not of much help if they can't see the script a user
has issues with.
2017-03-31 14:38:40 +01:00
UbitUmarov 9a01fddd1c add CanSellObject() permitions check functions 2017-03-30 17:39:21 +01:00
UbitUmarov d4111ff670 fix SimwideArea again 2017-01-27 20:59:56 +00:00
UbitUmarov 0091c37ed3 several changes relative to objects return and parcel prim counts: avoid null refs, report correct count of returned objects, make obkects counts by ownership coerent with return rules, etc 2017-01-27 20:21:24 +00:00
UbitUmarov 4b9c94a3aa bug fix: wrong enabled check 2017-01-27 13:10:57 +00:00
UbitUmarov 56e3aaefde Permissions modules where made NONShared modules. Make them so, removing incoerences and their potencial bugs 2017-01-27 12:32:01 +00:00
UbitUmarov 02fbe5a740 add and use CanDropInObjectInv 2017-01-25 19:39:58 +00:00
UbitUmarov 74ac2034e0 make use of CanDoObjectInvToObjectInv 2017-01-25 16:57:46 +00:00
UbitUmarov b45f6b933f fix a bug in CanCopyObjectInventory; add CanDoObjectInvToObjectInv ( not wired) 2017-01-24 14:01:39 +00:00
UbitUmarov c673ef7e3c replace calls to SOG.GetEffectivePermissions() by the new SOG.EffectiveOwnerPerms, some of those inline permissions checks should be reviewed and pass by permissions module 2017-01-22 23:05:39 +00:00
UbitUmarov 8d99c86f96 share before groupr roles was a testing elsewhere induced mistake, clean it up 2017-01-22 05:07:43 +00:00
UbitUmarov 50e318c401 work around group sharing and owned permitions issues, fix a non copy objects delete issue 2017-01-22 03:23:50 +00:00
UbitUmarov c14ec1a9bd a few more changes on permissions 2017-01-21 14:22:32 +00:00
UbitUmarov 7a1d9e213e fix CanReturnObjects 2017-01-21 11:21:36 +00:00
UbitUmarov 186f0b73cd add/fix CanRunScript 2017-01-21 10:22:00 +00:00
UbitUmarov 9d61df0887 fix CanObjectEntry and CanTerraformLand group permissions 2017-01-21 05:14:13 +00:00
UbitUmarov b20bd1a9df change the initialization point of SimwideArea 2017-01-21 03:35:59 +00:00
UbitUmarov 85a31c9e76 initialize SimwideArea 2017-01-21 02:29:08 +00:00
UbitUmarov 05196ebe27 test jenkins 2017-01-20 22:50:50 +00:00
UbitUmarov dac32c4e5a change CanObjectEntry() to use a SOG 2017-01-20 14:26:24 +00:00
UbitUmarov df40cdc83e remove redundant IsGod, rename some GOD as Administrator (both only on permissions module) 2017-01-20 13:45:44 +00:00
UbitUmarov 69bcbd856b change CanDuplicateObject 2017-01-19 19:01:56 +00:00
UbitUmarov 6826ca9b57 fix the meaning of objectDuplicate[OnRay]() flags parameter but still not using it 2017-01-19 18:25:25 +00:00
UbitUmarov d8108ab740 change CanDeedObject. WARNING like on other grids, if you do not set next owner rights on object and ALL ITS CONTENTS, you may loose all rights on it 2017-01-19 17:45:54 +00:00
UbitUmarov 984345a202 add CanEdit check for SOGs, iclients and SPs that need to be in scene and use it 2017-01-19 13:10:04 +00:00
UbitUmarov 673bd37219 object CanMove is for in scene SOGs Icleints and SPs and permitions module is NOT a shared module 2017-01-19 12:35:00 +00:00
UbitUmarov fe9a785ecc object Take and TakeCopy are for in scene SOPs and SPs and permitions module is NOT a shared module 2017-01-19 11:34:40 +00:00
UbitUmarov b9ecc962ac a few more aux methods and changes 2017-01-19 10:27:30 +00:00
UbitUmarov 3b96cd8ff2 add a GetItemPermissions() to be used use on object contents checks in Permissions module 2017-01-19 00:51:55 +00:00
UbitUmarov 1ff7e34996 a few more changes on Permissions module 2017-01-18 22:25:49 +00:00
UbitUmarov e963789714 Permissions module: fix in prim inv CanEditNotecard group edit rights check ( in last commit plz read .. by GetObjectPermissions) 2017-01-18 01:16:58 +00:00
UbitUmarov c14d81f538 Permissions module: replace some GenericObjectPermission by GenericObjectPermission on some checks. Note that in some cases behavour is now diferent. 2017-01-18 00:42:08 +00:00
UbitUmarov 6d784f6306 Permissions module: GenerateClientFlags() no need to keep looking for the same part several times; fix locked mask in GetObjectPermissions() 2017-01-17 23:22:02 +00:00
UbitUmarov 06bca0388f Permissions module: add GetObjectPermissions() that should replace GenericObjectPermission 2017-01-17 14:30:20 +00:00
UbitUmarov a5c693e302 start adding calls to effective permissions aggregation on changes; rearrange code in DuplicateObject(); 2017-01-17 00:41:30 +00:00
UbitUmarov 180add745c replace calls to SetOwnerId and SetRootPartOwner by a single new SetOwner() so owner is not changed twice on rootpart 2017-01-16 20:27:39 +00:00
UbitUmarov b9e2606c2f add code for fixing effective permitions. This is a test, and currently too slow for prodution. just finding our way home 2017-01-15 16:15:40 +00:00
UbitUmarov 6eaa8948a6 bad move.. revert 2017-01-14 23:23:56 +00:00
UbitUmarov 24d12dfba4 permissions GenerateClientFlags() also needs group GetEffectivePermissions() for the everyone case. Current naive uncached GetEffectivePermissions() must be improved since its now a lot more used. 2017-01-14 22:19:20 +00:00
UbitUmarov 3e0a61915f GenerateClientFlags: consider locked state, change object group; CanRezObject: remove odd elses and group roles are only for group owned land 2017-01-12 16:58:59 +00:00
UbitUmarov 0d538cb24c stop using a GetPermissionClass() in GenerateClientFlags since it is not good enough, just process the several cases inline 2017-01-11 22:47:31 +00:00
UbitUmarov 1253f19325 more changes to GenerateClientFlags(), use already cached presence group information, let it be aware of groups roles. (not exactly as the other grid) 2017-01-11 17:10:29 +00:00
UbitUmarov e0ab0b3b6b change GenerateClientFlags(...) to work with a scenepresence; make use of the new IsGod to check its God rights; remove the non standard estate manager right to move other ppl prims i added on last commits; coment out a test method i added sometime ago 2017-01-11 01:02:57 +00:00
UbitUmarov e3f7c27c93 remove obsolete PrimFlags.ObjectYouOfficer; rearrange GenerateClientFlags(...) with changes: allow estatemanager to move other ppl objects to help solve placement disputes; exclude attachments on that and from same group members 2017-01-10 23:45:19 +00:00
Melanie Thielker 6d44ee9099 Change improperly named isNPC to be IsNPC as a property should be uppercase 2017-01-07 20:30:51 +00:00
UbitUmarov ed526916b7 update permissions module with the new options 2017-01-07 16:27:06 +00:00
UbitUmarov f46d70ada5 try to work around some broken viewers math on handles 2017-01-07 12:18:44 +00:00
Melanie Thielker 8ab7e047bf Merge branch 'master' of opensimulator.org:/var/git/opensim 2017-01-06 17:07:44 +00:00
UbitUmarov 0b912b2acc Remove parcel_owner_is_god option. It is conceptually wrong and with
limited use. Relevant parcel owners can just be made estate managers with better regions management logic
2017-01-06 15:00:55 +00:00
Melanie Thielker 4385d7d693 Fix errors introduced by incomplete understanding of what folded perms are 2017-01-06 13:17:43 +00:00
Melanie Thielker ad8915f154 Restructure god level and permissions
Create a class GodController which controls all aspects of god level,
viewer modes and user levels at ScenePresence level.
2017-01-06 00:55:14 +00:00
Melanie Thielker b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
Melanie Thielker de16ce35a3 Make the estate communications handler selectable
Still defaults to the core EstateModule if not configured differently
2017-01-05 18:05:06 +00:00
Melanie Thielker e0a6691932 Rename the files and classes from XEstate to Estate
The names conflict with it's ancestor module and the code is nothing
like the out of core XEstateModule, so it should not be named the same.
2017-01-05 17:59:21 +00:00
UbitUmarov 40e982f6e7 a few changes to estates port handling 2017-01-05 17:11:03 +00:00
UbitUmarov d43a3bec19 a few changes to estates and estate teleportHome (used kick) 2017-01-05 16:27:17 +00:00
Mandarinka Tasty ed641b22b3 Show details of scene objects with given ownerId.
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com>
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2017-01-04 19:20:06 +00:00
UbitUmarov 70475c676b dont try to use a parcelID as encoded position when it is not 2016-12-23 14:25:22 +00:00
UbitUmarov 50842347ac fix: check for region_handle before region_id, viewers are so funny.. 2016-12-14 04:00:48 +00:00
UbitUmarov 66990394c9 avoid a null ref 2016-12-09 22:56:11 +00:00
UbitUmarov adee1c1bb0 fix a null ref 2016-11-30 10:08:49 +00:00
UbitUmarov 1aa4dbdb3f increase HG mapsearch spargetti; add more flexibility on input uri formats. To find regions in memory for a grid the http format needs to be used, because aditional compares made by viewers 2016-11-28 04:29:57 +00:00
UbitUmarov f9b62b5680 work around viewers not suporting large regions on landmark creation. They still may display wrong offset; don't let inventory description be limited by asset description side on a ossl method 2016-11-24 20:53:04 +00:00
UbitUmarov a858804b42 fix a vector range parsing 2016-11-14 22:08:39 +00:00
UbitUmarov d550b485f1 viewer crash bug fix: fis the udp packets split of SendEstateList() large lists; Enforce size limits on the estate lists since currently required for viewers compatibily; improve handling of changes with large selected items. This is still bad, users may need to close and reopen the region/estate information to get correct Allowed and Banned lists after a change. This happens because of viewer resent/outOfOrder packets that completly break this lists updates protocol 2016-10-24 10:23:31 +01:00
UbitUmarov 7494d7726a change math on GetParcelMaxPrimCount and GetSimulatorMaxPrimCount to reduce round errors, limit both to region max prims. consider ObjectBonus on last one also. Change a variable name in PrimLimitsModule to make it more clear 2016-10-11 01:14:53 +01:00
UbitUmarov 76a2d90dad remove attachment to event OnPreAgentUpdate that is doing nothing 2016-10-05 13:38:12 +01:00
UbitUmarov 58513fab8f save oar: simplify confusing successefull assets saving message 2016-09-27 16:49:55 +01:00
UbitUmarov f6e77e3935 load oar; activate area cliping if bounding-origin option is given. as help says 2016-09-27 15:24:05 +01:00
UbitUmarov 42989176ec mute a debug message to mute jak daniels 2016-09-23 19:27:25 +01:00
UbitUmarov d196958cc4 make sendRegionInfoPacketToAll really send to all ( inc child agents) thx Jak Daniels 2016-09-23 18:56:47 +01:00
UbitUmarov f613b5f517 fix caching of wind and cloud packets in the case of several regions on a instance, that got broken with the necessary send to child agents. 2016-09-23 18:28:46 +01:00
UbitUmarov 22b531f2e4 make clouds a bit diferent on regions running on same instance.. well should be diferent .. :) 2016-09-23 17:13:59 +01:00
UbitUmarov f5189b2cdd do the same for legacy clouds (still visible on older viewer ie singu 1.8.7). Fix clouds update. Send clouds and wind also to child agents. 2016-09-23 16:04:43 +01:00
UbitUmarov 8d7f10e36b cache wind compressed data so cpu burning compression is only done after a change. Not happy with version scheme for several regions on same instance, but should be ok for now 2016-09-23 13:55:23 +01:00
UbitUmarov a6df626868 add a version tag to wind and cloud data updates to iclient 2016-09-23 13:03:16 +01:00
UbitUmarov 984cb38583 move wind generation out of heartbeat to a pool job. Use that to send to all clients and not one per client 2016-09-23 12:32:40 +01:00
UbitUmarov d3627c4f33 no need to send wind on avatar arrival when it is sent periodicly 2016-09-22 19:25:04 +01:00
UbitUmarov 874ba6b363 avoid a null ref 2016-09-19 19:40:13 +01:00
UbitUmarov 592a915d8d add rest of wiring for terrain bake persistent store (mantis 8024 but not
using its code). Only did minor testing in MySQL
2016-09-17 17:56:56 +01:00
AliciaRaven 7c4c3f0d10 Minor. Remove unused integer arrays from TerrainModule 2016-09-15 22:46:59 +01:00
UbitUmarov b9380c033d move region comands out of LocalGridServiceConnector where they do not belong 2016-09-10 12:43:48 +01:00
UbitUmarov 49c579ec71 suspend httpdos on mapimge, fix image not been updated after first Get till restart 2016-09-05 12:30:25 +01:00
tglion 0e68742afc Fix some wrong handling of booleans for SeeAVs, AnyAVSounds and GroupAVSounds fields in sqlite3-database
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2016-09-05 08:39:16 +01:00
UbitUmarov c05ee23d3d minor change on warp3d lib 2016-08-24 04:10:35 +01:00
UbitUmarov 517064121d estate handleTerrainRequest memory leaks 2016-08-24 01:22:50 +01:00
UbitUmarov 8eacc6b207 replace warp3D.dll by a newer modified version. (only minor testing done :( 2016-08-23 10:58:34 +01:00
UbitUmarov 08c1dff86c change strange rotation in legacy MapImageModule (untested) 2016-08-22 20:43:47 +01:00
UbitUmarov 39e92adaf2 workaround potencial memory leak 2016-08-22 08:12:32 +01:00
UbitUmarov 4f4227d5bb workaround potencial memory leak 2016-08-22 06:23:55 +01:00
UbitUmarov c8a1d7e5a7 workaround potencial memory leaks 2016-08-22 03:55:01 +01:00
UbitUmarov 5d42d24428 limit the scan of terrain EnforceEstateLimits to the area changed. 2016-08-21 02:10:45 +01:00
UbitUmarov 73719b2efc fix terrain BMP image format on SaveStream mantis: 8001 2016-08-21 00:25:32 +01:00
UbitUmarov 7d968213fd fix region Allow damage and parcel safe flags handling 2016-08-17 23:33:11 +01:00
UbitUmarov 8fb7a3543f let physics know about region water level change 2016-08-09 22:29:11 +01:00
UbitUmarov 83d6722d31 if a viewer overloads region capability to process RequestMapBlocks, ignore following requests for 300 seconds. This was necessary becaus some viewers like FireStorm are doing it, saturating region and grid services for no usefull reason 2016-08-06 22:12:38 +01:00
UbitUmarov ec8101a24a remove references to RegionCombinerModule 2016-07-28 00:34:16 +01:00
UbitUmarov 3f0d84c28b cleanup some code 2016-07-25 19:49:40 +01:00
UbitUmarov d6d3e14f29 add a missing update to avatar damage Invulnerable 2016-07-24 19:31:28 +01:00
Melanie Thielker 4468aa0dcf Merge branch 'master' of opensimulator.org:/var/git/opensim 2016-07-04 03:37:45 +01:00
Melanie Thielker ea8f3c83bf Finally remove the requirement for an InventoryItem/FolderBase object to
be passed into inventory queries.
This makes the API more homogenous and also will more clearly show
coding
errors related to HG inventory where the .Owner field has a meaning
for a query but wasn't always set.
2016-07-04 03:35:48 +01:00
UbitUmarov 58135ef52c fix a lost region size of 256m 2016-07-03 19:39:13 +01:00
UbitUmarov 90b825cda8 if a NPC is owned, allow access if ownerID matchs parcel owner or it is in the access list. option OS_NPC_OBJECT_GROUP it still needed if access is by group (this option should also work with not owned NPC) NEEDS TESTING, may prove to be a bad solution 2016-06-28 23:30:04 +01:00
UbitUmarov 71404be21d let llPlaySound() in HUDs send sound to owner without parcel restriction 2016-06-26 10:02:56 +01:00
UbitUmarov 8cb3787de8 mantis 7942: allow llTriggerSound on HUDs to send sounds to all. 2016-06-26 09:40:05 +01:00
Diva Canto 359908fa88 Related to mantis #7929: "For sale" was not being accepted, because of permissions fail. This adds a new permissions check CanSellGroupObject. THIRD-PARTY PERMISSIONS MODULES TAKE NOTE OF THIS NEW EVENT. 2016-06-20 10:08:15 -07:00
Diva Canto 12b73603cc Still related to mantis #7917, parcel prims info. Now sending the correct numbers for "Simulator primitive usage" related to the parcel owner, not the entire region. 2016-06-19 09:17:04 -07:00
Diva Canto ce7fa728ef Mantis #7917: regression on prim limits module. 2016-06-18 22:07:01 -07:00
Diva Canto 53d8b8a83f Mantis #7874: parcel properties not being updated upon avatar entering new parcel. Root cause: update of the avatar's current property was being made too soon. 2016-06-11 10:23:07 -07:00
Melanie Thielker 1e44aba620 According to the SL wiki, estate managers can set parcels for sale. Make it sew. 2016-05-02 21:40:14 +02:00
Melanie Thielker a01f24e331 Replace the "land show" method with the better one from 0.8. 2016-04-28 16:13:23 +02:00
UbitUmarov 170acd7d67 change parcel_owner_is_god configuration option from default from true to false, leaving only region_owner true by default 2016-01-30 15:42:59 +00:00
UbitUmarov f8f28311bf stop avatar move to target on parcel ban enforce 2016-01-01 23:03:46 +00:00
UbitUmarov 7430c629aa enable the upload region map texture asset for large regions for large regions that i had disabled, but with max size reduced to 512pixels. New viewers don't use this, but osGetRegionMapTexture needs it ( mantis 7787 ) 2015-12-24 11:20:46 +00:00
UbitUmarov 41ae6f06e0 several changes to parcels access control and scenepresence updates rates 2015-12-16 22:16:51 +00:00
UbitUmarov 1d131a0c33 make parcel bans do something on vehicles. Just a first code, far from good 2015-12-15 21:00:06 +00:00
UbitUmarov b7155f5651 fix typo 2015-12-15 18:32:02 +00:00
UbitUmarov c7b963df8f replace GetNearestPoint... funtions 2015-12-15 17:13:32 +00:00
UbitUmarov 9db987b6f9 some changes parcels AABB math etc 2015-12-15 11:46:50 +00:00
UbitUmarov 4805e91d39 dont round to nearest int when checking position in parcel since next high int can be on other parcel 2015-12-15 04:10:47 +00:00
UbitUmarov 35b88b6580 removed unneeded funtions 2015-12-14 12:47:17 +00:00
UbitUmarov e37e8c3bdf on join parcels, keep the information of the larger parcel, since thats how its expected now 2015-12-14 12:29:00 +00:00
UbitUmarov 2a354f6c28 calculate land startpoint, endpoint and center estimate when it is updated, it not every time they are needed 2015-12-14 11:57:24 +00:00
UbitUmarov ca6b5fc80d taint prim count when join or subdivide parcels 2015-12-13 18:22:46 +00:00
UbitUmarov 736bcc70fe change default landpoint type to anywhere (direct) 2015-12-13 18:07:40 +00:00
UbitUmarov 819fe96503 invalidate LandPoint on land subdivide 2015-12-12 17:32:59 +00:00
UbitUmarov 4d493dd32e make sure land access/ban lists are active when changed by new viewers 2015-12-12 15:40:09 +00:00
UbitUmarov 3781c486c6 fix land access/ban list sending for new viewers 2015-12-12 13:05:24 +00:00
UbitUmarov 0934e1cf71 add IsEstateManager check to Permissions 2015-12-12 10:03:07 +00:00
Jak Daniels c0e920c1ad Fix Region Max height in boundingSize parameters checking in ArchiverModule.cs to float.MaxValue .. as was changed in ArchiveReadRequest.cs in commit 71f5c2b856 A comparison of consistent 'default' values determines whether boundingBox check is true.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-27 00:16:08 +00:00
Jak Daniels 15af6265a1 Fixed some stupid math and checks on --bounding-origin and --bounding-size. Bounding origin can of course be negative if it needs to be as we're taking stuff from the (possibly rotated) source region. Bounding size must always be >=0 and <= destination region size.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 17:30:08 +00:00
UbitUmarov f75d113230 change silly Monitor use 2015-11-22 08:40:55 +00:00
UbitUmarov ec069edead change syncronization method 2015-11-22 08:31:54 +00:00
UbitUmarov e28eecd0bf revert take the Monitor.wait out of the locks 2015-11-22 08:08:01 +00:00
UbitUmarov 1de096dffb coment out merge option on multiregion oar load i added 2015-11-22 08:00:58 +00:00
UbitUmarov 5c3f88b64d take the Monitor.wait out of the locks 2015-11-22 07:55:49 +00:00
UbitUmarov b80cbf5060 a few more changes on Multiregion control file load 2015-11-22 07:18:11 +00:00
UbitUmarov a6187db2a7 add a a missing monitor.wait if still not needed, mb in future 2015-11-22 05:44:06 +00:00
UbitUmarov 3be340cbf2 a few changes on Multiregion control file load ; load oar seems far from good 2015-11-22 05:42:13 +00:00
UbitUmarov f6820959b7 add Monitor.wait on load 2015-11-22 04:49:01 +00:00
UbitUmarov 4349bde440 reduce noise before compare 2015-11-22 04:10:26 +00:00
UbitUmarov 6dcbd20cfa add merge option on multioar test 2015-11-22 03:58:07 +00:00
UbitUmarov 71f5c2b856 minor changes 2015-11-22 03:56:48 +00:00
UbitUmarov 541d2ce2cd don't use 'funny' Quaternions 2015-11-22 02:22:48 +00:00
Jak Daniels 0b216c37df Changes to Load Oar options and new code to support importing OARs with different Region sizes to the destination region.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 01:32:48 +00:00
Jak Daniels cc992bf156 Changes to TerrainModule/ITerrainModule to support importing OARs with different Region sizes to the destination region.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 01:32:36 +00:00
Jak Daniels b23e5fd8b6 Changes to LandObject/ILandObject to support importing OARs with different Region sizes to the destination region.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 01:31:48 +00:00
UbitUmarov 9566c000f2 work around some 'tests' errors: terrain effects limits changed 2015-11-17 05:25:08 +00:00
UbitUmarov 1e87e90915 work around some 'tests' errors: allow sitTargetposition and orientation to be read from OAR on opensim, they are reset at avination, this may cause issues with old sits 2015-11-17 03:42:46 +00:00
UbitUmarov f57a48a0fb fix silly bug 2015-11-10 20:34:19 +00:00
UbitUmarov 5bfd49404d start TerrainCheckUpdates on heartbeat thread, but do it async; fix a bug on slow terrain send limits check 2015-11-10 17:44:53 +00:00
UbitUmarov 72684592ba Merge branch 'master' into avinationmerge
Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/Servers/ServerBase.cs
	OpenSim/Framework/VersionInfo.cs
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
	OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
	OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/GatekeeperService.cs
	OpenSim/Services/Interfaces/IAvatarService.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
2015-11-01 03:01:59 +00:00
UbitUmarov 9ba288a2e7 fix typo reported on mantis 7735 2015-10-31 22:48:31 +00:00
UbitUmarov 114ac59314 dont tell clients that we can edit a friend's attachments when we do forbid it 2015-10-27 01:20:21 +00:00
UbitUmarov d281ec5342 some fixes/changes on land send 2015-09-30 06:09:01 +01:00
UbitUmarov 8fde2fb901 slow down terrain sending so other users of LAND queue do have a chance to send things 2015-09-24 00:35:06 +01:00
UbitUmarov 33b4077c2c revert my change to the range of greyscale image maps, setting it back to 0 - 127.5 so not to break loading of old files. There isnt a range that fits all needs anyway 2015-09-21 00:44:53 +01:00
UbitUmarov fe5807cd09 fix terrain save greyscale mapping to 1:1 suporting standard 0-255m range and not only 0-127m. Jpeg format still using a non standard color encoded heightmap 2015-09-20 15:31:38 +01:00
UbitUmarov 56a4b5ba7a put back the hack to make viewers display map tags (now and then at least) that i had removed and do it also on the local region. Make parcel overlay a bit less transparent than i did before. 2015-09-19 21:30:09 +01:00
UbitUmarov ba4d0c1c6f a few more changes to worldMap. Use ExpireCaches, cache remote mapItems requests, etc 2015-09-19 06:42:52 +01:00
UbitUmarov 87ad573ec2 MapBlockFromGridRegion and Map2BlockFromGridRegion are the same thing 2015-09-18 02:00:10 +01:00
UbitUmarov 4798cce390 sync remote responses for mapItens with the local ones, but sending all valid information, so later we can cache/throotle 2015-09-17 21:51:51 +01:00
UbitUmarov ab18c801a9 dont block a region just bc it doesnt have the requested map item 2015-09-17 21:17:04 +01:00
UbitUmarov f4093a04e7 dont create terrain map asset for V1 viewers on large regions again, but do create parcel overlay since current viewers seem to use it (or we are missing something elsewhere) 2015-09-17 21:11:59 +01:00
UbitUmarov d767feafa4 generate maptile assets again, v2 do use at least the parcels overlay 2015-09-17 05:24:19 +01:00
UbitUmarov f6c2e6e1a3 merge issues and a few more changes 2015-09-17 05:10:24 +01:00
UbitUmarov 133f3a41eb remove bad merge code.. 2015-09-17 01:43:10 +01:00
UbitUmarov 2d88e4cf73 mute watchdog timeouts on world map work threads. They do wait for events for a long time 2015-09-15 04:56:26 +01:00
UbitUmarov 5b3e2ab9aa Merge branch 'mbworknew1' into ubitworkvarnew 2015-09-08 15:03:22 +01:00
Robert Adams e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905.
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
2015-09-08 04:54:16 -07:00
UbitUmarov 7276a89ddd recover opensim m_sendTerrainUpdatesByViewDistance. if false do as opensim (slower since it depended on sending terrain as TASK). if true send by view range and also all terrain at arrival 2015-09-07 11:23:00 +01:00
UbitUmarov abd6640453 allocate llRAW LookupHeightTable on demand and release it, saving a few 512KB of memory 2015-09-07 08:06:41 +01:00
UbitUmarov 3a8e76cdd1 restore terrain modifiers, left out earlier bc of merge errors, (untested) 2015-09-07 07:50:51 +01:00
UbitUmarov 94d13c6d22 dont store/upload map asset for large regions, ( needs testing) 2015-09-06 01:21:20 +01:00
UbitUmarov 2130984bef a few changes to stats. Array order coerent on users. give up on moses stats for now, since SimExtraStatsCollector cant reach SimStatsReport etc 2015-09-04 23:07:25 +01:00
Diva Canto d00f73c3a4 Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework. 2015-09-04 14:39:23 -07:00
UbitUmarov cdaed11387 at last we can login and see objects ( friends is dead and disable in
scenepresence)
2015-09-03 18:39:08 +01:00
UbitUmarov a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov 371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Diva Canto ce2c67876e More namespace and dll name changes. Still no functional changes. 2015-08-30 21:05:36 -07:00
UbitUmarov c24f3b4f5e minor changes 2015-08-31 04:37:52 +01:00
Diva Canto 2c0cad6dd3 Renamed the namespaces too 2015-08-30 20:29:31 -07:00
UbitUmarov 207dd6da48 fix some effects ranges 2015-08-29 05:28:13 +01:00
UbitUmarov 8a8acc41bb stop sending parcel overlays on parcels crossings since SL seems to have
stop sending also
2015-08-28 03:59:25 +01:00
UbitUmarov c967ecf0c7 also limit terrain flood effects ( like on pait change this should have
no visible impact, just cpu saving)
2015-08-28 02:33:54 +01:00
UbitUmarov bd4ec5f26c restrict terrain PaintBrushes to the requested area 2015-08-27 22:36:14 +01:00
UbitUmarov 195dd054de make terrain undo non op, it is broken and can't be global but per agent 2015-08-27 21:07:16 +01:00
UbitUmarov d1b4e0dd6a fix terrain bake for revert. just good enought fix 2015-08-27 19:20:41 +01:00
UbitUmarov 030c866b34 rename revert map as baked map, bc thats what it is 2015-08-27 15:48:13 +01:00
UbitUmarov b82b16c954 take taints check terrain out of Onframe event and add a new event for it. Slow it down to 1/4 heartbeat rate (once every 363ms aprox) 2015-08-27 15:01:15 +01:00
UbitUmarov f4f3b18221 fix bug 2015-08-25 20:08:05 +01:00
UbitUmarov 22f573a0be update raw32 file reader to core one. Warning only suports square regions 2015-08-25 20:00:31 +01:00
UbitUmarov 244f0c6352 change terrain internal representation to float. ushort work with legal
sl terrain, but may break existent terrain and that may cost a lot more
 than the cost of memory
2015-08-25 16:51:48 +01:00
UbitUmarov 64d05bab0f terrain stored as ushorts with gzip compression 2015-08-25 13:36:45 +01:00
UbitUmarov 3829df1059 try to implement core load oar options 2015-08-24 17:05:16 +01:00
UbitUmarov cbc569a1e0 rename ImapTileModule as IMAPImageUploadModule to match core 2015-08-24 11:06:12 +01:00
UbitUmarov e8a75151fa more on world map 2015-08-23 04:55:18 +01:00
UbitUmarov 24a093035b more fixes on map 2015-08-23 01:42:51 +01:00
UbitUmarov 5da9979024 Warp3D map now seems to work 2015-08-22 16:35:49 +01:00
UbitUmarov d22d46ee96 update MapSearchModule 2015-08-22 13:41:45 +01:00
UbitUmarov 5b03a04fb0 fix worldMapModule 2015-08-22 11:56:01 +01:00
UbitUmarov e3d82ad706 delay terrain sending if land queue is 2 busy 2015-08-22 04:08:30 +01:00
UbitUmarov 17082da0da "uglyfy" GetModifiedPatchesInViewDistance. Also make it use camera or
avatar position
2015-08-21 20:19:04 +01:00
UbitUmarov 4bb55cad67 dont use SendTerrainUpdatesByViewDistance option, code executes as true.
the option will have other use
2015-08-21 03:04:52 +01:00
UbitUmarov 512c892d83 send regions size on map blocks 2015-08-20 20:18:15 +01:00
UbitUmarov 2e15ed80cd fixes on warp3D 2015-08-19 12:08:45 +01:00
UbitUmarov 0b105da626 Merge branch 'mbworkvar2' into ubitvar 2015-08-19 08:48:50 +01:00
AliciaRaven 297d31b1c2 Prevent two maptiles being generated at startup, one for v1 and another for v2-3 service. * v1 Service (WorldMapModule) is called directly by scene on startup. This patch moves the initial map registration of the v2-3 service (MapImageServiceModule) to that point so they can share the bitmap instead of doubling the work of Warp3D and exasperate its memory leak issues.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-07-21 15:11:47 -04:00
AliciaRaven c37315da87 Warp3DImageModule. Reduce workload by not calling to render the root prim twice. When loading prims to draw the map, the Warp3D system first calls to load the root prim, followed by all the prims in the SOG. The initial call to load the root prim is not required because it is also in the parts list. The result of this was that all root prims were being loaded twice.
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-19 06:56:19 -07:00
Robert Adams 81ef7b586e Address Mantis 7592 (http://opensimulator.org/mantis/view.php?id=7592) by
disabling terrain patch sending by view distance for legacy sized regions.

The problem seems to be that people expect adjacent legacy sized regions
to just display like they always have. Limiting displayed terrain is
complicated by the camera position not being updated in child regions.
2015-06-06 07:09:20 -07:00
Diva Canto 3c596e47c6 Knocked off a few compiler warnings regarding unused variables. 2015-05-10 21:54:24 -07:00
Dev Random f20728fc86 Constrain 'terrain modify' to selected Region
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-05-09 15:25:33 -04:00
Michael Cerquoni dc4c9b1bb0 Minor whitespace removal 2015-05-07 14:09:29 -04:00