aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | |
| | * | | | | implement CoreAssetCache.Check()Justin Clark-Casey (justincc)2014-01-181-1/+2
| | | | | | |
| | * | | | | implement GlynnTuckerAssetCache.Check()Justin Clark-Casey (justincc)2014-01-181-1/+1
| | | | | | |
| | * | | | | Properly implement CenomeAssetCache.Check()Justin Clark-Casey (justincc)2014-01-181-2/+4
| | | | | | |
| | * | | | | Simplify FlotsamAssetCache.CheckFromMemoryCache()Justin Clark-Casey (justincc)2014-01-181-6/+1
| | | | | | |
| | * | | | | Elminate some copy/paste in FlotsamAssetCache.CheckFromFileCache() and use ↵Justin Clark-Casey (justincc)2014-01-181-33/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | using() construct to ensure filestream is always closed
| | * | | | | elminate unnecessary asset != null check in FlotsamAssetCache.UpdateFileCache()Justin Clark-Casey (justincc)2014-01-181-50/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Passed in asset is always not null
| | * | | | | minor: since structs are values, assigning them to another variable copies ↵Justin Clark-Casey (justincc)2014-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it. Instantiation is unnecessary.
| | * | | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-162-4/+4
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Remove old IInterRegionComms and references. This hasn't been used since ↵Justin Clark-Casey (justincc)2014-01-162-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2009 and was superseded by ISimulationService
| * | | | | | Merge branch 'master' into careminsterMelanie2014-01-282-31/+36
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-102-67/+56
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | When creating a coalesced object, set its permissions to the ↵Oren Hurvitz2014-01-101-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | lowest-common-denominator of all the sub-objects
| | | * | | | When creating a coalesced object, set its Creator ID if all the objects have ↵Oren Hurvitz2014-01-101-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the same creator
| | | * | | | Refactored: use a single function to apply an object's folded permissions to ↵Oren Hurvitz2014-01-102-18/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | its main permissions
| | | * | | | Refactored setting permissions when rezzing items: use the same function ↵Oren Hurvitz2014-01-101-37/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when rezzing from user inventory and prim inventory. Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
| * | | | | | Intermediate commit. Sill errors.Melanie2014-01-053-30/+47
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| | * | | | | Some missing definitions needed for successful compilation.Robert Adams2014-01-041-1/+2
| | | | | | |
| | * | | | | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-041-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs
| | * | | | | Fix issue with editing notes for other avatarsBlueWall2013-12-161-2/+2
| | | | | | |
| | * | | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-16/+22
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Make WindParamSet success a console message rather than a log message.Justin Clark-Casey (justincc)2013-12-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This effectively disables the log message as requested by http://opensimulator.org/mantis/view.php?id=6890
| | | * | | | minor: Make wind console commands print out to console rather than logJustin Clark-Casey (justincc)2013-12-141-14/+21
| | | | | | |
| | * | | | | Committing the Avination Scene Presence and related texture codeMelanie2013-12-117-130/+631
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements
| | * | | | | This is the Avination Entity Transfer Module. Surprisingly, it still compilesMelanie2013-12-111-217/+204
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | but I don't know if it runs. Will probably crash and burn as the supporting code isn't there yet.
| * | | | | Revert "Add support for user preferences (im via email)"Melanie2013-12-072-69/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
| * | | | | Merge branch 'master' into careminsterMelanie2013-12-072-0/+69
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add support for user preferences (im via email)BlueWall2013-12-062-0/+69
| | | | | |
| * | | | | Merge branch 'master' into careminsterMelanie2013-11-2311-64/+146
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| | * | | | Fix false positive test failure in ↵Justin Clark-Casey (justincc)2013-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TestRepeatSameDrawContainingImageReusingTexture() and TestRepeatSameDrawContainingImage() if localhost has a webserver set up. Use 0.0.0.0 instead of localhost
generated by cgit v1.1 at 2025-01-04 16:05:06 +0000