aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-2121-113/+175
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-122-0/+6
| |\
| | * Fix: Write asset data into Asset.db when using SQLiteMarck2010-11-132-0/+6
| | |
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-121-2/+3
| |\ \ | | |/
| | * provide avatar name in log if an exception ends up at the top of an async ↵Justin Clark-Casey (justincc)2010-11-121-2/+3
| | | | | | | | | | | | packet processing stack
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-121-1/+1
| |\ \ | | |/
| | * Fix prebubild.exe for Nant add missing "/" fixes Nant buildsBlueWall2010-11-121-1/+1
| | |
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-113-2/+6
| |\ \ | | |/
| | * Prebuild fixBlueWall2010-11-121-2/+2
| | | | | | | | | | | | | | | Make prebuild fix for monodevelop. Needed path to reference legacy Mono.Data.SQLite in ./bin/Mono.Data.SQLite.dll.
| | * Add PARCEL_DETAILS_ID to LSLBlueWall2010-11-122-0/+4
| | |
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-101-0/+7
| |\ \ | | |/
| | * Prevent teleporting to a region when the egent is banned in all parcelsMelanie2010-11-101-0/+7
| | |
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-091-1/+0
| |\ \ | | |/
| | * Remove a debug spamMelanie2010-11-101-1/+0
| | |
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-091-1/+3
| |\ \ | | |/
| | * Although the Allow Voice setting is per estate rather than per region,Melanie2010-11-091-1/+3
| | | | | | | | | | | | | | | apparently it is required in the region handshake to let the client enable parcel voice controls. So, send it.
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-092-15/+15
| |\ \ | | |/
| | * Fix parcel bans to work only on the avatars they're supposed to work on ↵Melanie2010-11-092-15/+15
| | | | | | | | | | | | instead of pushing all avatars, even the ones that are allowed.
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-0810-88/+86
| |\ \ | | |/
| | * Formatting cleanup.Jeff Ames2010-11-0810-88/+86
| | |
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-071-16/+20
| |\ \ | | |/
| | * Reinstate a lost fixMelanie2010-11-081-2/+1
| | |
| | * Fix merge artefactsMelanie2010-11-081-14/+19
| | |
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-073-4/+46
| |\ \ | | |/
| | * 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
| | |
* | | Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-0532-91/+295
|\ \ \ | |/ /
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-052-1/+35
| |\ \ | | |/
| | * 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 'master' of /var/git/opensim/opensim mirror account2010-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.
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-0212-1/+64
| |\ \ | | |/
| | * 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
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-024-1/+5
| |\ \ | | |/
| | * 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.
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-023-1/+15
| |\ \ | | |/
| | * 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' of /var/git/opensim/opensim mirror account2010-11-021-1/+7
| |\ \ | | |/
| | * Actually calculate the height before setting it, this isn't done automaticallyMelanie2010-11-031-1/+7
| | | | | | | | | | | | on incoming transfers in all cases.
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-021-0/+3
| |\ \ | | |/
| | * Trying to prevent a wrong physical actor sizeMelanie2010-11-031-0/+3
| | |
| * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-11-021-24/+11
| |\ \ | | |/
| | * Fix avatar height managementMelanie2010-11-021-24/+11
| | |