aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* buggUbitUmarov2014-08-071-28/+26
|
* DANGER... changed bakedtextures caching. Assuming grid baking is cacheUbitUmarov2014-08-071-81/+198
| | | | only, reduced number of accesses to it. TESTING
* apply objectSlamSale to all roots of coalescence objects. replace theUbitUmarov2014-08-051-7/+7
| | | | single object condition for renaming
* dont mess with names and descriptions on coalescence objects. InventoryUbitUmarov2014-08-051-1/+4
| | | | name can change for inventory purposes only.
* Merge branch 'master' into ubitworkmasterUbitUmarov2014-08-051-13/+17
|\
| * Stop deleting objects that have status DIE_AT_EDGE set when they cross regions.Melanie Thielker2014-08-031-13/+17
| | | | | | | | This was an OpenSim hack to prevent vehicles from trying to cross.
* | local chat gods bug fixUbitUmarov2014-08-041-2/+2
| |
* | missing currentParcelUUID updateUbitUmarov2014-08-031-0/+1
| |
* | mess update ( hide avatars )UbitUmarov2014-08-031-8/+12
| |
* | remove debug msgs at attachments deRezUbitUmarov2014-08-031-7/+1
| |
* | buggUbitUmarov2014-08-031-11/+15
| |
* | dont get script states for NPCs on deRezUbitUmarov2014-08-031-8/+11
| |
* | replace debug msgs by othersUbitUmarov2014-08-031-1/+12
| |
* | god also read local chatUbitUmarov2014-08-021-1/+6
|/
* add some filters for NPCsUbitUmarov2014-08-022-0/+7
|
* handle change of hide avatars flag. Parcel limits edition still need workUbitUmarov2014-08-011-10/+17
|
* remove unnecessary sendparceloverlayUbitUmarov2014-08-011-1/+1
|
* filter local chat from avatars or attachment acording to parcel hide (UbitUmarov2014-08-011-3/+34
| | | | not fully tested)
* MESS: changes in MakeRootAgent and CompleteMovement reordering things.UbitUmarov2014-07-312-5/+29
| | | | | | Added sending of land overlay and parcel information. This in order to only send avatar related information after having its position well defined and on the right parcel. THIS MAY STILL BE BAD :)
* restrict other avatar sounds to parcel flags ( untested )UbitUmarov2014-07-301-17/+34
|
* changes to parcels code (still more to to)UbitUmarov2014-07-302-77/+134
|
* Correct nomenclature for LLSD messages. LL sure suckMelanie Thielker2014-07-291-4/+4
|
* Try to plumb the other halfMelanie Thielker2014-07-292-0/+16
|
* Change some ORs to assignments as they should beMelanie Thielker2014-07-291-5/+5
|
* fix the mess about exclusive fields and flags on land overlayUbitUmarov2014-07-292-31/+34
|
* change parcel overlay bytes adding LocalSound.. changed others also NEEDSUbitUmarov2014-07-293-30/+66
| | | | checking
* dont mess with sound gain on stopUbitUmarov2014-07-271-1/+1
|
* change how sounds work. May be bad.. needs testingUbitUmarov2014-07-271-94/+55
|
* revert my change of not adding physcis to a failed avatar transfer. ThisUbitUmarov2014-07-241-3/+0
| | | | may need a better fix later ( doing a stand elsewhere?)
* on transfer fail of sited avatars, only doUbitUmarov2014-07-241-2/+2
|
* fix line endingUbitUmarov2014-07-241-4/+4
|
* if sited avatar cross fails, dont add it to physics and dont mess scriptsUbitUmarov2014-07-221-1/+4
| | | | (?)
* Remove extremely spammy error message that isn't an actual error - userMelanie Thielker2014-07-201-5/+5
| | | | | ids queried may not exist, since LSL can use this as well, with arbitrary ids
* Merge branch 'ubitworkmaster'Melanie Thielker2014-07-201-1/+1
|\
| * replace old Attachoffset by AttachedPos. Comented out possible mergeUbitUmarov2014-07-201-1/+1
| | | | | | | | artifacts
* | Fix duplicate attach message being sent to objects picked up from the groundMelanie Thielker2014-07-201-1/+4
|/
* Fix taking objectsMelanie Thielker2014-07-191-1/+1
|
* Merge branch 'avination-current'Melanie Thielker2014-07-191-5/+16
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| * Merge branch 'avination-current' into ubitworkUbitUmarov2014-07-168-39/+90
| |\
| * \ Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-081-1/+1
| |\ \
| * | | try to suspend and resume keyframes on copy to inventory to take copyUbitUmarov2013-06-061-1/+12
| | | | | | | | | | | | | | | | doesn't destroy state
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2184-1389/+6355
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2014-01-2818-477/+456
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| | * \ \ \ Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-244-320/+362
| | |\ \ \ \
| | | * | | | Properly dispose of drawing objects to reduce/stop memory leakage on ↵Justin Clark-Casey (justincc)2014-01-244-319/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | generating map tiles with the MapImageModule and TexturedMapTileRenderer (the current defaults)
| | | * | | | Add "generate map" console command to allow manual regeneration and storage ↵Justin Clark-Casey (justincc)2014-01-232-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of maptiles Primarily for test purposes though could be useful if one prefers to manually update the map tile
| | * | | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-202-4/+6
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Stop exceptions being generated on agent connection if a telehub object has ↵Justin Clark-Casey (justincc)2014-01-202-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | been deleted or has no spawn points.
| | * | | | | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-206-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
| | * | | | | Remove redundant methods in FlotsamAssetCacheJustin Clark-Casey (justincc)2014-01-181-10/+0
| | | | | | |