aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-082-4/+15
|\ \ | |/
| * Fix merge artefactsMelanie2010-11-081-14/+19
| |
| * Prevent plants from being treated like dropped attachments and removedMelanie2010-11-081-2/+1
| | | | | | | | from the sim.
| * Call the cleanup after saving attachment states, so that the attachmentsMelanie2010-11-081-1/+3
| | | | | | | | don't get killed before they can be saved
| * Call the Cleanup when an agent logs out, when an agent leaves and justMelanie2010-11-081-0/+3
| | | | | | | | | | before an agent logs in directly. Intentionally not calling this from MakeRoot as that would mess up attachment transfer in teleport
| * Call attachment cleanup when an agent crosses outMelanie Thielker2010-11-081-0/+2
| |
| * Add a method to delete left over / dropped attachmentsMelanie Thielker2010-11-081-0/+32
| |
| * Detach attachments displaced by other attachmentsMelanie2010-11-081-4/+8
| |
* | Decrease min search length to 2 chars for map search.Melanie2010-11-071-2/+2
| |
* | Fix the inventory transfer module to not cause duplicated text IMsMelanie2010-11-051-3/+6
| |
* | Fix merge artefactsMelanie2010-11-052-59/+22
| |
* | Revert "Spin the AddNewClient process off into a new thread to avoid locking ↵Melanie2010-11-051-24/+1
| | | | | | | | | | | | | | | | | | | | up the LLUDPServer (and therefore the entire scene)" This reverts commit 40e05f41098bdedac7296d84c9aa8d915c5c9ede. Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
* | Revert "Fix for hanging on "Connecting to region".. caused by packets being ↵Melanie2010-11-059-88/+63
| | | | | | | | | | | | | | | | | | | | | | | | processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready." This reverts commit 91b1d17e5bd3ff6ed006744bc529b53a67af1a64. Conflicts: OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-050-0/+0
|\ \ | |/
| * Fix playing sound from HUDsMelanie2010-11-052-2/+17
| |
| * Fix attached sounds from HUDs erroneously being delivered to other avatarsMelanie2010-11-051-0/+19
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-11-052-8/+55
|\ \ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Fix child prims returning after being unlinked and deleted where the root isMelanie2010-11-041-0/+5
| | | | | | | | | | | | not deleted
| * | Fix avatar to avatar inventory gives across serversMelanie2010-11-041-8/+50
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-052-0/+16
|\ \ \ | |/ / |/| / | |/
| * Delete existing presences for a user ID when they log in again.Melanie2010-11-052-0/+16
| | | | | | | | | | | | | | WARNING!!! This changes a default. The old default is to allow multiple presences, the new default disables this. As the feature currently has no users, this should not present any difficulty and will alleviate the presence issues somewhat.
* | Fix creation of a duplicate physics actor on chained drag-copy operations,Melanie2010-11-041-17/+0
| | | | | | | | the main cause for "ghost prims"
* | Fix playing sound from HUDsMelanie2010-11-032-10/+16
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-0314-2/+75
|\ \ | |/
| * Add lsClearWindlightScene() to the lightshare module to remove WL settingsMelanie2010-11-0312-1/+64
| | | | | | | | from a region and allow normal day cycles to be reestablished
| * When LightShare is enabled, the standard day cycle is bypassed and replaced byMelanie2010-11-034-1/+5
| | | | | | | | | | | | midday defaults when no specific LightShare profile is set. This prevents LightShare info being send out when the region has no LightShare profile, allowing normal day/night cycles to happen.
| * Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0Melanie2010-11-031-1/+1
| | | | | | | | | | | | so it reflects the prior default. We are not in the habot of changing default behavior without good reason and making localhost the default would break most current use cases.
| * Fix config items. Less used / expert items go in OpenSimDefaults.iniMelanie2010-11-032-3/+3
| | | | | | | | The default shown is always the hardcoded default
| * Admin Server can now bind to a private ip addressmores2010-11-033-1/+15
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0Melanie2010-11-031-1/+1
| | | | | | | | | | | | so it reflects the prior default. We are not in the habot of changing default behavior without good reason and making localhost the default would break most current use cases.
* | Fix config items. Less used / expert items go in OpenSimDefaults.iniMelanie2010-11-032-3/+3
| | | | | | | | The default shown is always the hardcoded default
* | Admin Server can now bind to a private ip addressmores2010-11-033-1/+15
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-031-0/+9
|\ \ | |/
| * Actually calculate the height before setting it, this isn't done automaticallyMelanie2010-11-031-1/+7
| | | | | | | | on incoming transfers in all cases.
| * Trying to prevent a wrong physical actor sizeMelanie2010-11-031-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-4/+1
|\ \ | |/
| * Fix avatar height managementMelanie2010-11-021-24/+11
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-0244-17765/+17759
|\ \ | |/
| * Fix default club feetMelanie2010-11-021-1/+1
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-022-0/+35
| |\
| | * Add support for cross-domain AJAX requests to REST console.Marck2010-11-021-0/+31
| | | | | | | | | | | | | | | | | | Enables RemoteConsole to add the appropriate HTTP header when responding to requests that use Cross-Origin Resource Sharing (CORS with simple requests). The allowed origin is set with configuration option "ConsoleAllowedOrigin" in section [Network]. For a suggestion to make this configuration option more flexible, see the TODO comment in the source code. The WifiConsole uses this functionality with grid mode.
| | * Support for CORS with simple requests in BaseHttpServerMarck2010-11-021-0/+4
| | |
| * | Fix sitting and standing upMelanie2010-11-021-5/+14
| |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-027-56/+92
| |\
| | * Old deserialization can't deal with commas in flag fields. Making use of ↵Diva Canto2010-11-024-21/+30
| | | | | | | | | | | | -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
| | * Thanks Snoopy for a patch that addresses Mantis #0005165: ↵dahlia2010-11-021-32/+32
| | | | | | | | | | | | | | | | | | osSetDynamicTextureURL crashed region server Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
| | * Fix HypergridLinker.Check4096()Marck2010-11-011-1/+28
| | | | | | | | | | | | Make the optimization with IEnumerable.Except() in Check4096 actually work by providing an appropriate equality definition for GridRegion objects.
| | * Removed a couple of very verbose debug messages.Diva Canto2010-10-311-2/+2
| | |
| * | Try to not make avatars switch outfitsMelanie2010-11-021-3/+0
| |/
| * Fixed: ToAvatarAppearance wasn't retrieving the AvatarHeight.Diva Canto2010-10-301-0/+3
| |