4a20a544d6
Merge branch 'master' of /var/git/opensim/
2010-11-08 04:50:04 -08:00
ae9c4a4d11
Formatting cleanup.
2010-11-08 07:48:35 -05:00
2e4c0c66ff
Merge branch 'master' of /var/git/opensim/
2010-11-07 20:00:06 -08:00
4ff3be90e0
Merge branch 'master' of /var/git/opensim/
2010-11-07 19:50:07 -08:00
df0787f5cf
Merge branch 'master' into careminster-presence-refactor
2010-11-08 03:08:02 +00:00
798abd1508
Reinstate a lost fix
2010-11-08 03:06:58 +00:00
8a97d58f09
Merge branch 'master' into careminster-presence-refactor
2010-11-08 03:05:07 +00:00
6056ae8d88
Fix merge artefacts
2010-11-08 02:58:33 +00:00
18b27408d6
Prevent plants from being treated like dropped attachments and removed
...
from the sim.
2010-11-08 02:39:06 +00:00
4f6dd8bda3
Call the cleanup after saving attachment states, so that the attachments
...
don't get killed before they can be saved
2010-11-08 02:38:15 +00:00
2f58d56137
Call the Cleanup when an agent logs out, when an agent leaves and just
...
before an agent logs in directly. Intentionally not calling this from MakeRoot
as that would mess up attachment transfer in teleport
2010-11-08 02:37:28 +00:00
d8fffd0fb5
Call attachment cleanup when an agent crosses out
2010-11-08 02:37:00 +00:00
2317b6767b
Add a method to delete left over / dropped attachments
2010-11-08 02:36:51 +00:00
6585243113
Detach attachments displaced by other attachments
2010-11-08 02:35:47 +00:00
5a3cd9f1d0
Decrease min search length to 2 chars for map search.
2010-11-07 16:08:41 +01:00
4f40374464
Merge git://github.com/opensim/opensim into mantis5110
2010-11-05 19:10:02 -07:00
3711f956a6
Merge branch 'master' of /var/git/opensim/
2010-11-05 07:40:06 -07:00
e89dcdada9
Merge branch 'master' of /var/git/opensim/
2010-11-05 07:30:10 -07:00
4db60a5a40
Fix the inventory transfer module to not cause duplicated text IMs
2010-11-05 15:24:08 +01:00
7844872067
Fix merge artefacts
2010-11-05 14:46:13 +01:00
644eb9fd7f
Fix playing sound from HUDs
2010-11-05 13:45:28 +00:00
e078c57bf0
Fix attached sounds from HUDs erroneously being delivered to other avatars
2010-11-05 13:39:04 +00:00
1c8d19d714
Delete existing presences for a user ID when they log in again.
...
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.
2010-11-05 13:31:45 +00:00
ddd3c6824a
Revert "Spin the AddNewClient process off into a new thread to avoid locking up the LLUDPServer (and therefore the entire scene)"
...
This reverts commit 40e05f4109
2010-11-05 14:27:53 +01:00
f985775962
Revert "Fix for hanging on "Connecting to region".. caused by packets being 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 91b1d17e5b
2010-11-05 14:27:14 +01:00
654814d563
Merge branch 'master' into careminster-presence-refactor
2010-11-05 13:45:50 +00:00
6bac92db80
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-05 13:34:54 +00:00
53d64f755a
Merge branch 'master' into careminster-presence-refactor
2010-11-05 13:33:58 +00:00
893915ce0b
Fix child prims returning after being unlinked and deleted where the root is
...
not deleted
2010-11-04 21:09:59 +01:00
82e534a029
Fix avatar to avatar inventory gives across servers
2010-11-04 19:07:43 +01:00
b8924167e0
Fix creation of a duplicate physics actor on chained drag-copy operations,
...
the main cause for "ghost prims"
2010-11-04 10:37:39 +01:00
c2bd6ccdb8
Fix playing sound from HUDs
2010-11-03 23:20:30 +01:00
e6972bfe6c
Merge branch 'master' of /var/git/opensim/
2010-11-02 20:30:05 -07:00
379fc60c06
Merge branch 'master' of /var/git/opensim/
2010-11-02 20:00:06 -07:00
5f8ab9f018
Merge branch 'master' into careminster-presence-refactor
2010-11-03 02:34:36 +00:00
6c3b7617b0
Add lsClearWindlightScene() to the lightshare module to remove WL settings
...
from a region and allow normal day cycles to be reestablished
2010-11-03 02:31:43 +00:00
c830f85fed
Merge branch 'master' of /var/git/opensim/
2010-11-02 19:10:04 -07:00
4ab9d37a8e
When LightShare is enabled, the standard day cycle is bypassed and replaced by
...
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.
2010-11-03 02:04:17 +00:00
50a3bf6e14
Merge branch 'master' of /var/git/opensim/
2010-11-02 18:40:03 -07:00
c25f84e31c
Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0
...
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.
2010-11-03 01:13:01 +00:00
e76980bc49
Fix config items. Less used / expert items go in OpenSimDefaults.ini
...
The default shown is always the hardcoded default
2010-11-03 01:12:52 +00:00
1f77f05f02
Admin Server can now bind to a private ip address
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:12:48 +00:00
636ca6218d
Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0
...
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.
2010-11-03 01:11:04 +00:00
c285f87702
Fix config items. Less used / expert items go in OpenSimDefaults.ini
...
The default shown is always the hardcoded default
2010-11-03 01:09:42 +00:00
d5d0e81df2
Admin Server can now bind to a private ip address
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:09:38 +00:00
87d56ec6ad
Merge branch 'master' of /var/git/opensim/
2010-11-02 18:00:07 -07:00
e9ec187746
Merge branch 'master' into careminster-presence-refactor
2010-11-03 00:48:18 +00:00
57eabe9d46
Actually calculate the height before setting it, this isn't done automatically
...
on incoming transfers in all cases.
2010-11-03 00:47:22 +00:00
732fdbff2a
Merge branch 'master' of /var/git/opensim/
2010-11-02 17:40:04 -07:00
7d551e27ca
Trying to prevent a wrong physical actor size
2010-11-03 00:01:47 +00:00
opensim mirror account