Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 21 | -113/+175 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-12 | 2 | -0/+6 |
| |\ | |||||
| | * | Fix: Write asset data into Asset.db when using SQLite | Marck | 2010-11-13 | 2 | -0/+6 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-12 | 1 | -2/+3 |
| |\ \ | | |/ | |||||
| | * | provide avatar name in log if an exception ends up at the top of an async ↵ | Justin Clark-Casey (justincc) | 2010-11-12 | 1 | -2/+3 |
| | | | | | | | | | | | | packet processing stack | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-12 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fix prebubild.exe for Nant add missing "/" fixes Nant builds | BlueWall | 2010-11-12 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-11 | 3 | -2/+6 |
| |\ \ | | |/ | |||||
| | * | Prebuild fix | BlueWall | 2010-11-12 | 1 | -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 LSL | BlueWall | 2010-11-12 | 2 | -0/+4 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-10 | 1 | -0/+7 |
| |\ \ | | |/ | |||||
| | * | Prevent teleporting to a region when the egent is banned in all parcels | Melanie | 2010-11-10 | 1 | -0/+7 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-09 | 1 | -1/+0 |
| |\ \ | | |/ | |||||
| | * | Remove a debug spam | Melanie | 2010-11-10 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-09 | 1 | -1/+3 |
| |\ \ | | |/ | |||||
| | * | Although the Allow Voice setting is per estate rather than per region, | Melanie | 2010-11-09 | 1 | -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 account | 2010-11-09 | 2 | -15/+15 |
| |\ \ | | |/ | |||||
| | * | Fix parcel bans to work only on the avatars they're supposed to work on ↵ | Melanie | 2010-11-09 | 2 | -15/+15 |
| | | | | | | | | | | | | instead of pushing all avatars, even the ones that are allowed. | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-08 | 10 | -88/+86 |
| |\ \ | | |/ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2010-11-08 | 10 | -88/+86 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-07 | 1 | -16/+20 |
| |\ \ | | |/ | |||||
| | * | Reinstate a lost fix | Melanie | 2010-11-08 | 1 | -2/+1 |
| | | | |||||
| | * | Fix merge artefacts | Melanie | 2010-11-08 | 1 | -14/+19 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-07 | 3 | -4/+46 |
| |\ \ | | |/ | |||||
| | * | Prevent plants from being treated like dropped attachments and removed | Melanie | 2010-11-08 | 1 | -2/+1 |
| | | | | | | | | | | | | from the sim. | ||||
| | * | Call the cleanup after saving attachment states, so that the attachments | Melanie | 2010-11-08 | 1 | -1/+3 |
| | | | | | | | | | | | | don't get killed before they can be saved | ||||
| | * | Call the Cleanup when an agent logs out, when an agent leaves and just | Melanie | 2010-11-08 | 1 | -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 out | Melanie Thielker | 2010-11-08 | 1 | -0/+2 |
| | | | |||||
| | * | Add a method to delete left over / dropped attachments | Melanie Thielker | 2010-11-08 | 1 | -0/+32 |
| | | | |||||
| | * | Detach attachments displaced by other attachments | Melanie | 2010-11-08 | 1 | -4/+8 |
| | | | |||||
* | | | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 32 | -91/+295 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-05 | 2 | -1/+35 |
| |\ \ | | |/ | |||||
| | * | Fix playing sound from HUDs | Melanie | 2010-11-05 | 2 | -2/+17 |
| | | | |||||
| | * | Fix attached sounds from HUDs erroneously being delivered to other avatars | Melanie | 2010-11-05 | 1 | -0/+19 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-05 | 2 | -0/+16 |
| |\ \ | | |/ | |||||
| | * | Delete existing presences for a user ID when they log in again. | Melanie | 2010-11-05 | 2 | -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 account | 2010-11-02 | 12 | -1/+64 |
| |\ \ | | |/ | |||||
| | * | Add lsClearWindlightScene() to the lightshare module to remove WL settings | Melanie | 2010-11-03 | 12 | -1/+64 |
| | | | | | | | | | | | | from a region and allow normal day cycles to be reestablished | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-02 | 4 | -1/+5 |
| |\ \ | | |/ | |||||
| | * | When LightShare is enabled, the standard day cycle is bypassed and replaced by | Melanie | 2010-11-03 | 4 | -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 account | 2010-11-02 | 3 | -1/+15 |
| |\ \ | | |/ | |||||
| | * | Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0 | Melanie | 2010-11-03 | 1 | -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.ini | Melanie | 2010-11-03 | 2 | -3/+3 |
| | | | | | | | | | | | | The default shown is always the hardcoded default | ||||
| | * | Admin Server can now bind to a private ip address | mores | 2010-11-03 | 3 | -1/+15 |
| | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-02 | 1 | -1/+7 |
| |\ \ | | |/ | |||||
| | * | Actually calculate the height before setting it, this isn't done automatically | Melanie | 2010-11-03 | 1 | -1/+7 |
| | | | | | | | | | | | | on incoming transfers in all cases. | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-02 | 1 | -0/+3 |
| |\ \ | | |/ | |||||
| | * | Trying to prevent a wrong physical actor size | Melanie | 2010-11-03 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-02 | 1 | -24/+11 |
| |\ \ | | |/ | |||||
| | * | Fix avatar height management | Melanie | 2010-11-02 | 1 | -24/+11 |
| | | |