Melanie
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
.
Conflicts:
OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-11-05 14:27:14 +01:00
Melanie
654814d563
Merge branch 'master' into careminster-presence-refactor
2010-11-05 13:45:50 +00:00
Melanie
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
Melanie
53d64f755a
Merge branch 'master' into careminster-presence-refactor
2010-11-05 13:33:58 +00:00
Melanie
893915ce0b
Fix child prims returning after being unlinked and deleted where the root is
...
not deleted
2010-11-04 21:09:59 +01:00
Melanie
82e534a029
Fix avatar to avatar inventory gives across servers
2010-11-04 19:07:43 +01:00
Melanie
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
Melanie
c2bd6ccdb8
Fix playing sound from HUDs
2010-11-03 23:20:30 +01:00
opensim mirror account
e6972bfe6c
Merge branch 'master' of /var/git/opensim/
2010-11-02 20:30:05 -07:00
opensim mirror account
379fc60c06
Merge branch 'master' of /var/git/opensim/
2010-11-02 20:00:06 -07:00
Melanie
5f8ab9f018
Merge branch 'master' into careminster-presence-refactor
2010-11-03 02:34:36 +00:00
Melanie
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
opensim mirror account
c830f85fed
Merge branch 'master' of /var/git/opensim/
2010-11-02 19:10:04 -07:00
Melanie
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
opensim mirror account
50a3bf6e14
Merge branch 'master' of /var/git/opensim/
2010-11-02 18:40:03 -07:00
Melanie
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
Melanie
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
mores
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
Melanie
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
Melanie
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
mores
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
opensim mirror account
87d56ec6ad
Merge branch 'master' of /var/git/opensim/
2010-11-02 18:00:07 -07:00
Melanie
e9ec187746
Merge branch 'master' into careminster-presence-refactor
2010-11-03 00:48:18 +00:00
Melanie
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
opensim mirror account
732fdbff2a
Merge branch 'master' of /var/git/opensim/
2010-11-02 17:40:04 -07:00
Melanie
7d551e27ca
Trying to prevent a wrong physical actor size
2010-11-03 00:01:47 +00:00
Melanie
797e461ef9
Merge branch 'master' into careminster-presence-refactor
2010-11-02 23:41:13 +00:00
Melanie
d555c373d8
Fix avatar height management
2010-11-02 23:39:45 +00:00
Melanie
26f12f479f
Merge branch 'master' into careminster-presence-refactor
2010-11-02 22:58:33 +00:00
opensim mirror account
dabc51299c
Merge branch 'master' of /var/git/opensim/
2010-11-02 15:40:05 -07:00
opensim mirror account
2dc6c007c2
Merge branch 'master' of /var/git/opensim/
2010-11-02 15:30:08 -07:00
Melanie
43ac44b028
Fix default club feet
2010-11-02 21:41:27 +00:00
Melanie
5eeabb8b4b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-02 21:29:02 +00:00
Melanie
78a0ed3ff9
Fix sitting and standing up
2010-11-02 21:28:24 +00:00
opensim mirror account
57632db62e
Merge branch 'master' of /var/git/opensim/
2010-11-02 14:20:03 -07:00
Marck
4fdab71c8d
Add support for cross-domain AJAX requests to REST console.
...
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.
2010-11-02 14:12:25 -07:00
Marck
4d1f0c5348
Support for CORS with simple requests in BaseHttpServer
2010-11-02 14:11:49 -07:00
opensim mirror account
cf6ae44c0a
Merge branch 'master' of /var/git/opensim/
2010-11-02 14:00:08 -07:00
Melanie
e327e990f5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-02 19:55:27 +00:00
Melanie
63ffdcf53a
Try to not make avatars switch outfits
2010-11-02 19:55:05 +00:00
opensim mirror account
c77e2c8830
Merge branch 'master' of /var/git/opensim/
2010-11-02 12:10:07 -07:00
Diva Canto
9f5ab3b965
Old deserialization can't deal with commas in flag fields. Making use of -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
2010-11-02 12:05:24 -07:00
opensim mirror account
f7b05a5760
Merge branch 'master' of /var/git/opensim/
2010-11-02 02:40:06 -07:00
dahlia
ed7959ddfb
Thanks Snoopy for a patch that addresses Mantis #0005165 : osSetDynamicTextureURL crashed region server
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-11-02 02:35:56 -07:00
opensim mirror account
07817abc28
Merge branch 'master' of /var/git/opensim/
2010-11-01 08:20:06 -07:00
Marck
2bce1716af
Fix HypergridLinker.Check4096()
...
Make the optimization with IEnumerable.Except() in Check4096 actually work by providing an appropriate equality definition for GridRegion objects.
2010-11-01 08:01:31 -07:00
Jonathan Freedman
12d61d1ef5
Merge branch 'master' into mantis5110
2010-10-31 20:50:39 -04:00
opensim mirror account
c8d96f2f6a
Merge branch 'master' of /var/git/opensim/
2010-10-31 12:20:07 -07:00
Diva Canto
f15f0ab59b
Removed a couple of very verbose debug messages.
2010-10-31 12:11:30 -07:00
Jonathan Freedman
0a56cfbfd5
* better semantics for link-region command
...
* actually parse name for new link-region command
2010-10-30 22:51:52 -04:00