aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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 '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
| | * \ \ \ \ \ 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
| | * | | | | | | 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
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ 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
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-082-44/+76
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-036-89/+80
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-10-062-3/+8
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | careminster
| | | * | | | | | | | | | | * Fixes cases where Last Attachment Point gets overwritten with 0 when it ↵teravus2013-10-052-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shouldn't * Fixes cases where Last Attachment Point doesn't get written when it should. * Fixes Null Reference in BaseHttpServer when shutting down, null path provided. * Drop then Wear retains Last Attachment Point
| | * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-10-062-1/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| | * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-10-0412-36/+129
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination-current' into careminsterMelanie2013-09-162-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-09-076-22/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
generated by cgit v1.1 at 2025-04-22 02:24:05 +0000