Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 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 |
| | | |||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-02 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix default club feet | Melanie | 2010-11-02 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-02 | 1 | -5/+14 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-02 | 2 | -0/+35 |
| |\ | |||||
| * | | Fix sitting and standing up | Melanie | 2010-11-02 | 1 | -5/+14 |
| | | | |||||
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-02 | 2 | -0/+35 |
|\ \ \ | | |/ | |/| | |||||
| * | | Add support for cross-domain AJAX requests to REST console. | Marck | 2010-11-02 | 1 | -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 BaseHttpServer | Marck | 2010-11-02 | 1 | -0/+4 |
| |/ | |||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-02 | 1 | -3/+0 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-02 | 7 | -56/+92 |
| |\ | |||||
| * | | Try to not make avatars switch outfits | Melanie | 2010-11-02 | 1 | -3/+0 |
| | | | |||||
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-02 | 4 | -21/+30 |
|\ \ \ | | |/ | |/| | |||||
| * | | Old deserialization can't deal with commas in flag fields. Making use of ↵ | Diva Canto | 2010-11-02 | 4 | -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. | ||||
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-02 | 1 | -32/+32 |
|\ \ \ | |/ / | |||||
| * | | Thanks Snoopy for a patch that addresses Mantis #0005165: ↵ | dahlia | 2010-11-02 | 1 | -32/+32 |
| | | | | | | | | | | | | | | | | | | osSetDynamicTextureURL crashed region server Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | ||||
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-01 | 1 | -1/+28 |
|\ \ \ | |/ / | |||||
| * | | Fix HypergridLinker.Check4096() | Marck | 2010-11-01 | 1 | -1/+28 |
| | | | | | | | | | | | | Make the optimization with IEnumerable.Except() in Check4096 actually work by providing an appropriate equality definition for GridRegion objects. | ||||
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-31 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Removed a couple of very verbose debug messages. | Diva Canto | 2010-10-31 | 1 | -2/+2 |
| |/ |