Commit Graph

15987 Commits (3f7050173d589a40706ba41c0c9ad74e01d7d080)

Author SHA1 Message Date
Melanie 5a3cd9f1d0 Decrease min search length to 2 chars for map search. 2010-11-07 16:08:41 +01:00
Jonathan Freedman 4f40374464 Merge git://github.com/opensim/opensim into mantis5110 2010-11-05 19:10:02 -07:00
opensim mirror account 3711f956a6 Merge branch 'master' of /var/git/opensim/ 2010-11-05 07:40:06 -07:00
opensim mirror account e89dcdada9 Merge branch 'master' of /var/git/opensim/ 2010-11-05 07:30:10 -07:00
Melanie 4db60a5a40 Fix the inventory transfer module to not cause duplicated text IMs 2010-11-05 15:24:08 +01:00
Melanie 7844872067 Fix merge artefacts 2010-11-05 14:46:13 +01:00
Melanie 644eb9fd7f Fix playing sound from HUDs 2010-11-05 13:45:28 +00:00
Melanie e078c57bf0 Fix attached sounds from HUDs erroneously being delivered to other avatars 2010-11-05 13:39:04 +00:00
Melanie 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
Melanie 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.

Conflicts:

	OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
2010-11-05 14:27:53 +01:00
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