aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Slight improvement on previous commit.Diva Canto2010-07-301-1/+13
|
* Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-07-3023-2310/+88
|\
| * remove gods event subscription to gods module from sceneJustin Clark-Casey (justincc)2010-07-303-25/+32
| |
| * remove empty, unused and uncalled UnsubscribeToClientEvents()Justin Clark-Casey (justincc)2010-07-301-4/+0
| |
| * move attachment subscription events into AttachmentsModule from scene.Justin Clark-Casey (justincc)2010-07-303-38/+28
| | | | | | | | restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
| * remove unused BasicQuadTreeNodeJustin Clark-Casey (justincc)2010-07-302-274/+0
| |
| * store terrain module trying to load plugins if plugin path does not existJustin Clark-Casey (justincc)2010-07-301-2/+7
| |
| * move ChannelDigger from its own project into the main terrain module with ↵Justin Clark-Casey (justincc)2010-07-302-25/+1
| | | | | | | | the rest of the effects
| * remove long unused OpenSim/Framework/Configuration/* projectsJustin Clark-Casey (justincc)2010-07-304-375/+0
| |
| * Remove unused ILoginServiceToRegionsConnectorJustin Clark-Casey (justincc)2010-07-301-41/+0
| |
| * Remove unused LLFileTransferJustin Clark-Casey (justincc)2010-07-302-407/+0
| |
| * remove long superseded HGNetworkServersInfoJustin Clark-Casey (justincc)2010-07-301-107/+0
| |
| * remove unused FriendRegionInfoJustin Clark-Casey (justincc)2010-07-301-38/+0
| |
| * remove now unused GridConfig, MessageServerConfig, UserConfigJustin Clark-Casey (justincc)2010-07-304-583/+0
| |
| * remove unused ACL classJustin Clark-Casey (justincc)2010-07-302-377/+0
| |
| * convert attachments module from old region module style to newJustin Clark-Casey (justincc)2010-07-301-19/+25
| |
* | Changed the way HG client verification is done: now transforming local and ↵Diva Canto2010-07-304-9/+84
|/ | | | LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network.
* * Added debug logging to SimianGrid inventory service response parsingJohn Hurliman2010-07-291-0/+2
|
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-07-291-3/+4
|\
| * * Tweaked WebUtil.PostToService() to help debug an object disposed exceptionJohn Hurliman2010-07-291-3/+4
| |
* | Make dataserver() return a 0 when agent id offline, instead of a timeoutMelanie Thielker2010-07-291-5/+4
|/
* Allow gods and estate managers/owners to be unaffected by parcel bansMelanie Thielker2010-07-293-0/+24
|
* Add some optionsMelanie2010-07-241-0/+11
|
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-07-242-2/+3
|\
| * remove compile.bat from a created binary distributionJustin Clark-Casey (justincc)2010-07-231-0/+1
| |
| * in nant distbin, specifically only delete Regions.ini instead of the entire ↵Justin Clark-Casey (justincc)2010-07-231-1/+1
| | | | | | | | Regions directory
| * Added ': ' to password prompt. Mantis #4851Diva Canto2010-07-221-1/+1
| |
* | Fix some inventory issuesMelanie2010-07-241-0/+29
|/
* Adding sample configuration to previous patchMelanie2010-07-221-0/+3
|
* Add sending of the avatar interests and configuration of the profilesMelanie2010-07-221-2/+33
| | | | | | module as an OpenSim profile module to Simian grid services. Patch by Dimentox, thank you. Applied with changes.
* Allow Megaregions to start properly after an unclean shutdownMelanie2010-07-202-1/+4
|
* Restore lines that have been removed due to previous merge conflict.Diva Canto2010-07-201-2/+6
|
* Remove a merge artefactMelanie2010-07-201-4/+0
|
* When a god uses mass permission setting, the V bit is cleared from nextMelanie Thielker2010-07-201-4/+7
| | | | | perms, rendering the item unmoveable for the next owenr. Make god mods conform to the rules, too.
* prevent hacked viewers from being able to delete arbitrary items from anyMelanie Thielker2010-07-201-3/+18
| | | | | prim. Allow friends with perms and shared group members to move or copy things out of prims
* Fix a few permissions vulnerability. Owners could cause permissionsMelanie Thielker2010-07-203-8/+40
| | | | escalation on items contained in prims using a hacked viewer
* adjust DialogModule to only send broadcast alerts to root agentsJustin Clark-Casey (justincc)2010-07-201-2/+3
|
* Relaxed the ultra-conservative lock on m_items. Needs testing under linux ↵Diva Canto2010-07-201-219/+188
| | | | and stress.
* Adding it again.Diva Canto2010-07-201-28/+36
| | | | | | Revert "Reverting this for now, but this needs to go in again." This reverts commit c0d9ab941dd1ab88f00f6d4f2a53a4fe5c605e57.
* Reverting this for now, but this needs to go in again.Diva Canto2010-07-191-36/+28
| | | | | | Revert "Another stab at http://opensimulator.org/mantis/view.php?id=4858. Eliminated more nested locks." This reverts commit ffbae52a130376ecaa04d7d475709985c62c06ed.
* Another stab at http://opensimulator.org/mantis/view.php?id=4858. Eliminated ↵Diva Canto2010-07-191-28/+36
| | | | more nested locks.
* One more stab at http://opensimulator.org/mantis/view.php?id=4858.Diva Canto2010-07-191-33/+33
| | | | Eliminated the nested locks of m_Scripts and m_PrimObjects.
* Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests ↵Diva Canto2010-07-191-1/+0
| | | | indicate that this is what causes deadlock. More tests needed.
* re-add the sleep lost in the revert.Melanie2010-07-191-0/+2
|
* Revert "Thank you, Snoopy, for a patch to reduce sim script startup CPU usage"Melanie2010-07-191-12/+10
| | | | This reverts commit c404c5fb5405eac24cc8b7cd402eb8d8fb0ff0cf.
* Revert "A stab in the dark. Revert the compile lockout temporarily. If you ↵Melanie2010-07-191-20/+20
| | | | | | know what" This reverts commit f798679b8005e532f933553007cca989112f4a1d.
* A stab in the dark. Revert the compile lockout temporarily. If you know whatMelanie2010-07-191-20/+20
| | | | this is, you should test it. If you don't, don't use it.
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-07-172-22/+28
|\
| * Allow use of old angle rules PSYS_SRC_INNERANGLE and PSYS_SRC_OUTERANGLE in ↵Justin Clark-Casey (justincc)2010-07-171-0/+20
| | | | | | | | | | | | | | llParticleSystem() This is a patch from http://opensimulator.org/mantis/view.php?id=3201 Thanks Micheil Martin!
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-07-172-6/+20
| |\