f8ccfaf046
Fixed a few conflicts with Dan's code (earlier conflict resolution by Dan broke
...
remote script engine's execution) to make remote script engine execute as it did in
the implementation in Country Fair 2010 demo.
2010-11-12 15:50:21 -08:00
f0fac8ca3a
Merge branch 'master' of /var/git/opensim/
2010-11-12 15:30:10 -08:00
1e7334d985
provide avatar name in log if an exception ends up at the top of an async packet processing stack
2010-11-12 23:20:07 +00:00
c79b81d2ca
Merge branch 'master' of /var/git/opensim/
2010-11-12 10:30:10 -08:00
9c8680cd69
Fix prebubild.exe for Nant add missing "/" fixes Nant builds
2010-11-12 17:35:06 +00:00
4b21e4d7c5
Merge branch 'master' of /var/git/opensim/
2010-11-11 18:20:08 -08:00
672ee2a888
Prebuild fix
...
Make prebuild fix for monodevelop. Needed path to reference
legacy Mono.Data.SQLite in ./bin/Mono.Data.SQLite.dll.
2010-11-12 01:17:33 +00:00
00b0f521fa
Add PARCEL_DETAILS_ID to LSL
2010-11-12 01:16:14 +00:00
b02ca416e5
Merge branch 'master' of /var/git/opensim/
2010-11-10 09:20:09 -08:00
bfc128529c
Prevent teleporting to a region when the egent is banned in all parcels
2010-11-10 16:20:19 +00:00
a92d0faf50
Merge branch 'master' of /var/git/opensim/
2010-11-09 18:20:05 -08:00
ff3e466000
Remove a debug spam
2010-11-10 01:17:40 +00:00
d93aff0276
Merge branch 'master' of /var/git/opensim/
2010-11-09 16:50:03 -08:00
846198bb9e
Although the Allow Voice setting is per estate rather than per region,
...
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:55:43 +00:00
a969036562
Merge branch 'master' of /var/git/opensim/
2010-11-09 15:10:08 -08:00
22144eb8f7
Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed.
2010-11-09 22:15:59 +00:00
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
798abd1508
Reinstate a lost fix
2010-11-08 03:06:58 +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
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
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
bca02499dc
Fixed some code in Initialise() in both RegionSyncClientModule and ScriptEngineToSceneConnectorModule, so that OpenSim will not crach if [RegionSyncModule] is not specified or under it, "Enabled" is set.
2010-11-04 15:22:11 -07: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
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
87d56ec6ad
Merge branch 'master' of /var/git/opensim/
2010-11-02 18:00:07 -07: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
d555c373d8
Fix avatar height management
2010-11-02 23:39:45 +00:00
dabc51299c
Merge branch 'master' of /var/git/opensim/
2010-11-02 15:40:05 -07:00
Huaiyu (Kitty) Liu