Commit Graph

14213 Commits (08c3cd6b369e2bb8dfa08709c2ffddaea4cdbaa5)

Author SHA1 Message Date
Melanie 6585243113 Detach attachments displaced by other attachments 2010-11-08 02:35:47 +00: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 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
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 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
opensim mirror account 87d56ec6ad Merge branch 'master' of /var/git/opensim/ 2010-11-02 18:00:07 -07: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 d555c373d8 Fix avatar height management 2010-11-02 23:39:45 +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
Jonathan Freedman 95a0ea78f9 Merge branch 'master' into mantis5110 2010-10-30 18:28:07 -04:00
opensim mirror account e6a050f79e Merge branch 'master' of /var/git/opensim/ 2010-10-30 12:40:03 -07:00
Diva Canto 48f6d47744 Fixed: ToAvatarAppearance wasn't retrieving the AvatarHeight. 2010-10-30 12:30:03 -07:00
opensim mirror account 0ae4774ce5 Merge branch 'master' of /var/git/opensim/ 2010-10-30 12:10:13 -07:00
Melanie 623cee1ffc Move physics actor creation to after SetHeight to try and prevent
bowlegginess. Didn't work but is better this way anyway.
2010-10-30 19:17:52 +01:00
Jonathan Freedman 96a29c43b0 Merge branch 'master' into mantis5110 2010-10-30 14:11:02 -04:00
Jonathan Freedman e371d3208c Merge branch 'master' into mantis5110
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2010-10-30 14:10:13 -04:00
Melanie e98d8d500f Fix logins and avatar appearance. Contains a Migration. May contain nuts.
This will cause visual params to be persisted along with worn items. With
this, alpha and tattoo laters will be saved. Multiple layers MAY work, but
not tested because I don't use Viewer 2.
2010-10-30 19:06:47 +01:00