Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-09 | 10 | -88/+86 |
|\ | |||||
| * | 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. | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-11-08 | 10 | -88/+86 |
| | | |||||
* | | 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. | ||||
* | | Remove "OpenSimulator" from startup message | Melanie | 2010-11-09 | 1 | -1/+1 |
| | | |||||
* | | Change "OpenSim" to "Careminster" and remove CM suffix. | Melanie | 2010-11-09 | 1 | -2/+2 |
| | | |||||
* | | Prevent temp-on-rez prims from being persisted | Melanie | 2010-11-08 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-08 | 1 | -7/+0 |
|\ \ | |/ | |||||
| * | Reinstate a lost fix | Melanie | 2010-11-08 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-08 | 2 | -4/+15 |
|\ \ | |/ | |||||
| * | Fix merge artefacts | Melanie | 2010-11-08 | 1 | -14/+19 |
| | | |||||
| * | 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 |
| | | |||||
* | | Decrease min search length to 2 chars for map search. | Melanie | 2010-11-07 | 1 | -2/+2 |
| | | |||||
* | | Fix the inventory transfer module to not cause duplicated text IMs | Melanie | 2010-11-05 | 1 | -3/+6 |
| | | |||||
* | | Fix merge artefacts | Melanie | 2010-11-05 | 2 | -59/+22 |
| | | |||||
* | | Revert "Spin the AddNewClient process off into a new thread to avoid locking ↵ | Melanie | 2010-11-05 | 1 | -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 ↵ | Melanie | 2010-11-05 | 9 | -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-refactor | Melanie | 2010-11-05 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | 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 'careminster-presence-refactor' of ↵ | Melanie | 2010-11-05 | 2 | -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 is | Melanie | 2010-11-04 | 1 | -0/+5 |
| | | | | | | | | | | | | not deleted | ||||
| * | | Fix avatar to avatar inventory gives across servers | Melanie | 2010-11-04 | 1 | -8/+50 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 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. | ||||
* | | Fix creation of a duplicate physics actor on chained drag-copy operations, | Melanie | 2010-11-04 | 1 | -17/+0 |
| | | | | | | | | the main cause for "ghost prims" | ||||
* | | Fix playing sound from HUDs | Melanie | 2010-11-03 | 2 | -10/+16 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-03 | 14 | -2/+75 |
|\ \ | |/ | |||||
| * | 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 | ||||
| * | 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. | ||||
| * | 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> | ||||
* | | 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' into careminster-presence-refactor | Melanie | 2010-11-03 | 1 | -0/+9 |
|\ \ | |/ | |||||
| * | 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. | ||||
| * | Trying to prevent a wrong physical actor size | Melanie | 2010-11-03 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 1 | -4/+1 |
|\ \ | |/ | |||||
| * | Fix avatar height management | Melanie | 2010-11-02 | 1 | -24/+11 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 44 | -17765/+17759 |
|\ \ | |/ | |||||
| * | Fix default club feet | Melanie | 2010-11-02 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 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. |