aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-1210-266/+184
|\
| * Merge branch 'master' into careminsterMelanie2011-12-1210-266/+184
| |\
| | * Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsCo...Dan Lake2011-12-126-50/+57
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-12-123-191/+72
| | |\
| | | * Mantis 5816: osParseJSON Decoding Problemsnebadon2011-12-113-191/+72
| | * | Added an option for extra settings within region ini file. Any non-hardcoded ...Dan Lake2011-12-121-20/+55
| | |/
* | | Send changed animation event asynchronouslyMelanie2011-12-121-14/+17
|/ /
* | Fix a regression that causes data from the attachments module to fail loadingMelanie2011-12-102-14/+7
* | Prevent spurious error message when client tries to move a null itemMelanie2011-12-102-119/+143
* | Merge branch 'master' into careminsterMelanie2011-12-105-0/+18
|\ \ | |/
| * Implement handler for TeleportCancel inbound packetMelanie2011-12-105-0/+18
* | Merge branch 'master' into careminsterMelanie2011-12-1011-105/+58
|\ \ | |/
| * minor: remove a mono compiler warningJustin Clark-Casey (justincc)2011-12-091-1/+1
| * Print out one log message for every missing baked texture, rather than two.Justin Clark-Casey (justincc)2011-12-091-22/+4
| * minor: comment out "unpacked appearance" log mesasge for nowJustin Clark-Casey (justincc)2011-12-091-1/+1
| * Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now.Justin Clark-Casey (justincc)2011-12-091-1/+1
| * Do some clean up Scene.cs log messages.Justin Clark-Casey (justincc)2011-12-091-24/+38
| * Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ...Justin Clark-Casey (justincc)2011-12-097-57/+16
* | Merge branch 'master' into careminsterMelanie2011-12-096-16/+106
|\ \ | |/
| * remove some unused fields in ScenePresenceJustin Clark-Casey (justincc)2011-12-091-4/+0
| * Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.Justin Clark-Casey (justincc)2011-12-091-4/+5
| * Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that i...Justin Clark-Casey (justincc)2011-12-091-4/+6
| * Add commented log lines to FetchInventoryDescendents2 path for future use.Justin Clark-Casey (justincc)2011-12-093-4/+95
* | Restore the Avination way of position and angle calculation so resizersMelanie2011-12-091-5/+2
* | Set adaptive throttles false by default because it doesn't play nice with AVNMelanie2011-12-091-1/+1
* | Fix llGetLinkKey to report avatars properlyMelanie2011-12-091-19/+0
* | Reverse the last oneMelanie2011-12-091-1/+1
* | Dummy commitMelanie2011-12-091-1/+1
* | Merge branch 'careminster' into bigmergeMelanie2011-12-090-0/+0
|\ \
| * | Fix the XMREngine not starting scripts on region startup. Turns out itMelanie Thielker2010-07-251-5/+0
| * | Fix the XmlRpcRouterModule so it reads from the correct config section ([XMLR...Tom Grimshaw2010-07-241-2/+2
| * | Add an m_enabled flag to XmlRpcRouterModule so it won't try to bind the xmlrp...Tom Grimshaw2010-07-241-2/+10
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterTom Grimshaw2010-07-220-0/+0
| |\ \
| | * | Fix up the name of the default permissions module to match it's config nameMelanie Thielker2010-07-231-1/+1
| * | | ... Then, make sure we also check the old-style module stack before we throw ...Tom Grimshaw2010-07-221-2/+13
| * | | First, change DefaultPermissionsModule so it returns the correct name...Tom Grimshaw2010-07-221-1/+1
| |/ /
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterTom Grimshaw2010-07-224-27/+59
| |\ \
| | * | Allow megaregions to be used in M7, should we so decideMelanie Thielker2010-07-212-22/+27
| | * | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-07-213-5/+32
| | |\ \
| | | * | Fix the XML serializationt to provide an empty script state element ifMelanie2010-07-201-4/+28
| | | * | Allow Megaregions to start properly after an unclean shutdownMelanie2010-07-172-1/+4
| * | | | Add config option securePermissionsLoading which will stop the region from lo...Tom Grimshaw2010-07-222-0/+24
| |/ / /
| * | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-07-1724-223/+667
| |\ \ \ | | |/ /
| | * | Stop occasional permanently high 100% utilization when the server is started ...Justin Clark-Casey (justincc)2010-07-171-10/+12
| | * | extend exception catching for DoCreateChildAgentCall() from just WebException...Justin Clark-Casey (justincc)2010-07-171-4/+3
| | * | Bug in 0.6.9 sometimes restoring script state causes region console to crash ...unknown2010-07-171-39/+84
| | * | Merge branch '0.6.9-post-fixes' of ssh://opensimulator.org/var/git/opensim in...Justin Clark-Casey (justincc)2010-07-133-13/+18
| | |\ \
| | | * | llVecNorm() now returns a zero-length vector when one is supplied as input. A...dahlia2010-07-081-7/+2
| | | * | fix a potential division by zerodahlia2010-07-081-6/+11
| | | * | Fix scripts in rezzed objects not starting (Mantis #4775)Melanie2010-06-301-0/+5