aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-041-9/+12
|\
| * Prevent IMs being sent to prims when avies decline inventory offers from them.Diva Canto2012-11-041-9/+12
* | Merge branch 'master' into careminsterMelanie2012-11-011-2/+2
|\ \ | |/
| * Comment out checks not to overwrite existing IAR/OAR files for now on "save i...Justin Clark-Casey (justincc)2012-11-011-2/+2
* | Merge branch 'master' into careminsterMelanie2012-10-311-3/+3
|\ \ | |/
| * Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-311-3/+3
* | Merge branch 'master' into careminsterMelanie2012-10-283-15/+30
|\ \ | |/
| * minor: Fix verbose IAR save message to make it a bit clearer that item data i...Justin Clark-Casey (justincc)2012-10-271-1/+1
| * Fix "save iar" hanging permanently if the asset request phase times out.Justin Clark-Casey (justincc)2012-10-263-14/+29
* | Merge branch 'master' into careminsterMelanie2012-10-263-85/+109
|\ \ | |/
| * Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations sin...Justin Clark-Casey (justincc)2012-10-261-77/+77
| * Fix script error messages not showing up in viewer 3 and associated viewers.Justin Clark-Casey (justincc)2012-10-251-12/+27
| * Get "save oar" and "save iar" to tell you in a more friendly manner if the fi...Justin Clark-Casey (justincc)2012-10-241-0/+4
* | Merge branch 'master' into careminsterMelanie2012-10-201-29/+24
|\ \ | |/
| * Improve efficiency of friends notification by only make one PresenceService c...Justin Clark-Casey (justincc)2012-10-201-29/+24
* | Merge branch 'avination' into careminsterMelanie2012-10-171-2/+2
|\ \
| * | Fix perms when linking an object. Set root part perms to the permsMelanie2012-10-141-1/+1
| * | Remove spammy debug for IMMelanie2012-10-111-3/+3
| * | Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
* | | Fix merge issuesMelanie2012-10-072-3/+3
* | | Merge branch 'master' into careminsterMelanie2012-10-073-2/+44
|\ \ \ | | |/ | |/|
| * | On receiving TaskInventoryAccepted with a destination folder in the binary bu...Justin Clark-Casey (justincc)2012-10-064-3/+45
* | | Merge branch 'master' into careminsterMelanie2012-10-041-1/+2
|\ \ \ | |/ /
| * | Fix the use of the wrong index when locating the assets associatedMic Bowman2012-10-031-1/+2
* | | Merge branch 'master' into careminsterMelanie2012-10-032-1/+49
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-021-1/+10
| |\ \
| | * | implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-021-1/+10
| * | | Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-09-292-25/+61
|\ \ \ | |/ /
| * | Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an object...Justin Clark-Casey (justincc)2012-09-292-14/+18
| * | Extend attachment regression test to check for appropriate attach event firing.Justin Clark-Casey (justincc)2012-09-291-25/+49
* | | Merge branch 'avination' into careminsterMelanie2012-09-271-1/+2
|\ \ \ | | |/ | |/|
| * | Make the agent being kicked a child agent first so there won't be a ghostMelanie2012-09-161-1/+2
* | | Merge branch 'master' into careminsterMelanie2012-09-242-2/+5
|\ \ \ | | |/ | |/|
| * | Guard against inventory get failures.Diva Canto2012-09-221-0/+3
| * | Correctly override and call base OpenSimTestCase.SetUp() method in GridConnec...Justin Clark-Casey (justincc)2012-09-191-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-09-161-3/+3
|\ \ \ | |/ /
| * | minor: Comment out friends notification log spam for now.Justin Clark-Casey (justincc)2012-09-121-3/+3
* | | Merge branch 'avination' into careminsterMelanie2012-09-101-0/+3
|\ \ \ | | |/ | |/|
| * | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IMMelanie2012-09-091-0/+3
* | | Merge branch 'master' into careminsterMelanie2012-08-291-32/+32
|\ \ \ | | |/ | |/|
| * | Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where folder...Justin Clark-Casey (justincc)2012-08-291-32/+32
* | | Merge branch 'master' into careminsterMelanie2012-08-231-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Add --force flag to "kick user" console command to allow bypassing of recent ...Justin Clark-Casey (justincc)2012-08-201-1/+1
| * Fix scripted detach of temp attachmentsMelanie2012-08-201-6/+2
* | Fix scripted detach of temp attachmentsMelanie2012-08-201-6/+2
* | Merge branch 'master' into careminsterMelanie2012-08-142-16/+37
|\ \ | |/
| * As per lindn spec, disable detach and drop for temp attachmentsMelanie2012-08-141-0/+8
| * Lay some groundwork for temp attachments. Decouple attachments from inventory.Melanie2012-08-142-17/+30
* | Merge branch 'master' into careminsterMelanie2012-08-041-4/+4
|\ \ | |/
generated by cgit v1.1 at 2024-11-16 09:42:08 +0000