aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix a merge artefact that broke script state persistence in XAttachmentsMelanie2010-09-191-1/+1
* Overwrite the core version of the string parsing method with oursMelanie2010-09-171-60/+37
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-37/+60
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-174-35/+111
| |\
| * | Applying the llParseString2List() patch from #5036 that Melanie claims was al...John Hurliman2010-09-171-81/+22
* | | Remove the now unused partslockroot2010-09-171-1/+0
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-0/+4
|\ \ \ | | |/ | |/|
| * | Send kill packets for avatars, tooMelanie2010-09-171-0/+4
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1728-1259/+830
|\ \ \ | |/ /
| * | Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-173-35/+107
| |/
| * Fixed a regression in SOG.Copy()John Hurliman2010-09-161-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-166-3/+55
| |\
| | * Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}Justin Clark-Casey (justincc)2010-09-171-22/+21
| | * Send KillPackets on the Task queue rather than the State queueJustin Clark-Casey (justincc)2010-09-173-2/+17
| | * Removing debugroot2010-09-161-1/+0
| | * JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-164-1/+40
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA...John Hurliman2010-09-1625-1191/+856
| |/
* | Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-173-35/+107
* | Removing debugroot2010-09-161-1/+0
* | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-164-1/+40
* | Catch a nullrefroot2010-09-161-1/+2
* | Some small bug fixesroot2010-09-162-1/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-165-63/+60
|\ \ | |/
| * extend m_entityUpdates.SyncRoot lock in LLClientView.ProcessEntityUpdates() t...Justin Clark-Casey (justincc)2010-09-151-49/+49
| * rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve co...Justin Clark-Casey (justincc)2010-09-154-4/+4
| * Instead of locking SOG.Children when a group is being removed from the scene,...Justin Clark-Casey (justincc)2010-09-151-15/+17
* | Don't fart when deserializing a prim with no ParentGroup set yetmeta72010-09-151-1/+5
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie Thielker2010-09-1410-56/+53
|\ \
| * | reorder some code to avoid merge issues in the futureMelanie2010-09-141-5/+5
| * | Fix merge issuesMelanie2010-09-142-5/+2
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1410-49/+49
| |\ \ | | |/
| | * Revert "Move OpenSimDefaults,ini into config-include in order to put it with ...Justin Clark-Casey (justincc)2010-09-141-1/+1
| | * Move OpenSimDefaults,ini into config-include in order to put it with all the ...Justin Clark-Casey (justincc)2010-09-141-1/+1
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-139-52/+45
| | |\
| | | * Comment out SOG storing debug log messageJustin Clark-Casey (justincc)2010-09-141-3/+3
| | | * minor: Add comments which explain what's going on wrt avatar movements at var...Justin Clark-Casey (justincc)2010-09-132-0/+6
| | | * Improve generic message exception logging. Quieten down complaints about unh...Justin Clark-Casey (justincc)2010-09-131-2/+4
| | | * Add client name to packet resend log messages to make them a bit more informa...Justin Clark-Casey (justincc)2010-09-131-3/+7
| | | * Remove SceneGraph.DetachObject() which was accidentally left around after bei...Justin Clark-Casey (justincc)2010-09-131-10/+0
| | | * Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUse...Justin Clark-Casey (justincc)2010-09-131-4/+4
| | | * Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interfaceJustin Clark-Casey (justincc)2010-09-132-16/+13
| | | * If attachment fails (e.g. because asset wasn't found) then don't try to set a...Justin Clark-Casey (justincc)2010-09-131-4/+2
| | | * minor: Clean up log messages generated when an item is attachedJustin Clark-Casey (justincc)2010-09-133-12/+8
| | * | Add a missing parenthesisMelanie2010-09-131-1/+1
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-131-4/+6
| | |\ \ | | | |/
| | | * * Fixing length calculations for HTTP texture downloads (the end byte is incl...John Hurliman2010-09-131-4/+6
| | * | Change the help message to point to copying OpenSimDefaults.ini.example.Melanie2010-09-131-1/+1
| | * | Output an error and quit if the master file is missing. Also renameMelanie2010-09-131-4/+16
| | * | Make the inimaster option default to OpenSimDefaults.ini.Melanie2010-09-131-1/+1
| | |/
* | | Adjust the code for ghost prim removal to new information from KittoMelanie Thielker2010-09-141-3/+7
|/ /