aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-04-215-28/+113
|\
| * Make the detection cone in attachments face in the direction of the avatar,Melanie2010-04-211-0/+9
| * minor: change a comment and replace some magic numbers with the AssetType enumJustin Clark-Casey (justincc)2010-04-191-3/+3
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-1914-31/+113
| |\
| | * Avoid duplicate script resumes. Move resume calls to more logical placesMelanie Thielker2010-04-192-2/+2
| * | Make the "notecard saved" text appear in the saver rather than the notecard o...Justin Clark-Casey (justincc)2010-04-193-11/+9
| * | If a transfer request is received for a task inventory item asset, then route...Justin Clark-Casey (justincc)2010-04-192-50/+75
| * | log problems when an asset request through the UDP TransferRequest channel go...Justin Clark-Casey (justincc)2010-04-191-2/+45
* | | Avoid duplicate script resumes. Move resume calls to more logical placesMelanie Thielker2010-04-192-2/+2
* | | Remove the event trigger for the attach event from the attachment module.Melanie Thielker2010-04-191-1/+1
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-192-33/+30
|\ \ \ | | |/ | |/|
| * | Make script asset fetches synchronous. Script instantiation synchronizationMelanie2010-04-191-28/+24
| * | Stopgap measure. Disable the recent script startup changes until I can cure theMelanie2010-04-191-1/+1
| * | And some more rez modes that weren't covered beforeMelanie Thielker2010-04-191-0/+2
* | | And some more rez modes that weren't covered beforeMelanie Thielker2010-04-191-0/+2
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-191-0/+2
|\ \ \ | |/ /
| * | Also enable scripts rezzed into primsMelanie2010-04-191-0/+2
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-190-0/+0
|\ \ \
| * \ \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-198-18/+50
| |\ \ \
| | * | | Slightly tweak README to account for the fact that first-time standalone user...Justin Clark-Casey (justincc)2010-04-181-1/+2
| | * | | Update OpenMetaverse libraries to those used in master as of commit 9a781e7Justin Clark-Casey (justincc)2010-04-185-0/+0
| | * | | Fix http://opensimulator.org/mantis/view.php?id=4657 where OpenSim.Grid.UserS...Justin Clark-Casey (justincc)2010-04-162-17/+48
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-1963-590/+1513
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | All scripts are now created suspended and are only unsuspended when the objectMelanie2010-04-1914-3/+85
| | |_|/ | |/| |
| * | | Slightly tweak README to account for the fact that first-time standalone user...Justin Clark-Casey (justincc)2010-04-181-1/+2
| * | | One more bug fix in sqlite sql statements.Diva Canto2010-04-161-1/+1
| * | | Bug fix: UserAccounts in SQLite was missing the primary key constraint.Diva Canto2010-04-161-1/+1
| * | | Expose Delete at IUserAccountData interface. It was there already. No changes...Diva Canto2010-04-162-0/+22
| * | | refactor: move DeatchObject() into the AttachmentsModuleJustin Clark-Casey (justincc)2010-04-173-6/+24
| * | | refactor: remove now unused internal method SendAttachEvent()Justin Clark-Casey (justincc)2010-04-161-5/+0
| * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-161-1/+1
| |\ \ \
| | * | | Bug fix in SQLite/SQLiteUserAccountData.cs: Missing'(' in one of the SQL stat...Diva Canto2010-04-161-1/+1
| * | | | refactor: crudely move DetachSingleAttachmentToGround() over to the Attachmen...Justin Clark-Casey (justincc)2010-04-164-33/+40
| |/ / /
| * | | minor: correctly print out missing item id when it can't be found rather than...Justin Clark-Casey (justincc)2010-04-162-2/+4
| * | | refactor: crudely move the RezMultipleAttachments() method into the Attachmen...Justin Clark-Casey (justincc)2010-04-164-14/+28
| * | | minor: use the static ascii and utf8 encodings instead of instantiating our ownJustin Clark-Casey (justincc)2010-04-161-6/+3
| * | | Add --skip-assets option to load oar.Justin Clark-Casey (justincc)2010-04-165-28/+50
| * | | add a missing initialization of the m_memoryCache in XmlRpcGroupsServicesConn...Justin Clark-Casey (justincc)2010-04-161-1/+1
| * | | minor: stop irc bridge warning about not attached to regions if it's not been...Justin Clark-Casey (justincc)2010-04-161-1/+1
| * | | minor: stop datasnapshot issuing a warning log message if it's disabledJustin Clark-Casey (justincc)2010-04-161-3/+3
| * | | Fix http://opensimulator.org/mantis/view.php?id=4657 where OpenSim.Grid.UserS...Justin Clark-Casey (justincc)2010-04-162-17/+48
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-04-144-19/+96
| |\ \ \
| | * | | This version of the launcher exe works.Diva Canto2010-04-141-0/+0
| | * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-04-143-20/+35
| | |\ \ \
| | | * | | minor: add some documentation around the asset udp request path and replace s...Justin Clark-Casey (justincc)2010-04-142-19/+34
| | * | | | The missing .csproj for the Robust 32 bit launcherDiva Canto2010-04-141-0/+62
| * | | | | Patch from mcortez to add basic caching to the groups module. This prevents d...John Hurliman2010-04-142-52/+160
| | |/ / / | |/| | |
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-04-147-4/+179
| |\ \ \ \ | | |/ / /
| | * | | * Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.Diva Canto2010-04-147-4/+179
| * | | | Applying a patch from lkalif to fix a small bug in the previous patchJohn Hurliman2010-04-141-1/+1
| |/ / /