Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | replace hand parsing of incoming object media messages with parsing code in ↵ | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -60/+31 |
| | | | | libopenmetaverse | ||||
* | start storing incoming MediaEntry on a new Media field on PrimitiveBaseShape | Justin Clark-Casey (justincc) | 2010-07-26 | 2 | -3/+67 |
| | | | | | This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv | ||||
* | have a stab at sending the correct number of media entries to shapes | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -2/+14 |
| | | | | | | actually, this is probably wrong anyway if there's a default texture it's going to be easier just to gather the object media updates and retain those in-memory now but what the hell | ||||
* | do a whole load of crappy hacking to get cubes to display google.com | Justin Clark-Casey (justincc) | 2010-07-26 | 2 | -7/+90 |
| | | | | | | currently, for smoe reason the page only appears when you click a face. also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason you can still change the url and normal navigation will work again | ||||
* | Register ObjectMedia and ObjectMediaNavigate capabilities from moap module. | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -5/+53 |
| | | | | | Not sure if these are correct, but just supplying these to the viewer is enough to allow it to put media textures on prims (previously the icons were greyed out). This is not yet persisted even in-memory, so no other avatars will see it yet. | ||||
* | add stub media-on-a-prim (shared media) module | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -0/+56 |
| | |||||
* | remove compile.bat from a created binary distribution | Justin Clark-Casey (justincc) | 2010-07-23 | 1 | -0/+1 |
| | |||||
* | in nant distbin, specifically only delete Regions.ini instead of the entire ↵ | Justin Clark-Casey (justincc) | 2010-07-23 | 1 | -1/+1 |
| | | | | Regions directory | ||||
* | Added ': ' to password prompt. Mantis #4851 | Diva Canto | 2010-07-22 | 1 | -1/+1 |
| | |||||
* | Adding sample configuration to previous patch | Melanie | 2010-07-22 | 1 | -0/+3 |
| | |||||
* | Add sending of the avatar interests and configuration of the profiles | Melanie | 2010-07-22 | 1 | -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 shutdown | Melanie | 2010-07-20 | 2 | -1/+4 |
| | |||||
* | Restore lines that have been removed due to previous merge conflict. | Diva Canto | 2010-07-20 | 1 | -2/+6 |
| | |||||
* | Remove a merge artefact | Melanie | 2010-07-20 | 1 | -4/+0 |
| | |||||
* | When a god uses mass permission setting, the V bit is cleared from next | Melanie Thielker | 2010-07-20 | 1 | -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 any | Melanie Thielker | 2010-07-20 | 1 | -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 permissions | Melanie Thielker | 2010-07-20 | 3 | -8/+40 |
| | | | | escalation on items contained in prims using a hacked viewer | ||||
* | adjust DialogModule to only send broadcast alerts to root agents | Justin Clark-Casey (justincc) | 2010-07-20 | 1 | -2/+3 |
| | |||||
* | Relaxed the ultra-conservative lock on m_items. Needs testing under linux ↵ | Diva Canto | 2010-07-20 | 1 | -219/+188 |
| | | | | and stress. | ||||
* | Adding it again. | Diva Canto | 2010-07-20 | 1 | -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 Canto | 2010-07-19 | 1 | -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 Canto | 2010-07-19 | 1 | -28/+36 |
| | | | | more nested locks. | ||||
* | One more stab at http://opensimulator.org/mantis/view.php?id=4858. | Diva Canto | 2010-07-19 | 1 | -33/+33 |
| | | | | Eliminated the nested locks of m_Scripts and m_PrimObjects. | ||||
* | Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests ↵ | Diva Canto | 2010-07-19 | 1 | -1/+0 |
| | | | | indicate that this is what causes deadlock. More tests needed. | ||||
* | re-add the sleep lost in the revert. | Melanie | 2010-07-19 | 1 | -0/+2 |
| | |||||
* | Revert "Thank you, Snoopy, for a patch to reduce sim script startup CPU usage" | Melanie | 2010-07-19 | 1 | -12/+10 |
| | | | | This reverts commit c404c5fb5405eac24cc8b7cd402eb8d8fb0ff0cf. | ||||
* | Revert "A stab in the dark. Revert the compile lockout temporarily. If you ↵ | Melanie | 2010-07-19 | 1 | -20/+20 |
| | | | | | | know what" This reverts commit f798679b8005e532f933553007cca989112f4a1d. | ||||
* | A stab in the dark. Revert the compile lockout temporarily. If you know what | Melanie | 2010-07-19 | 1 | -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/opensim | Melanie | 2010-07-17 | 2 | -22/+28 |
|\ | |||||
| * | Allow use of old angle rules PSYS_SRC_INNERANGLE and PSYS_SRC_OUTERANGLE in ↵ | Justin Clark-Casey (justincc) | 2010-07-17 | 1 | -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/opensim | Justin Clark-Casey (justincc) | 2010-07-17 | 2 | -6/+20 |
| |\ | |||||
| | * | Fixes mantis #4872. Port for GridInfo was wrong in Robust.HG.ini.example | Diva Canto | 2010-07-15 | 1 | -1/+1 |
| | | | |||||
| * | | Fix bugs in llRot2Euler() | Justin Clark-Casey (justincc) | 2010-07-17 | 1 | -21/+7 |
| | | | | | | | | | | | | | | | Applies patch in http://opensimulator.org/mantis/view.php?id=4482. Thanks Micheil Merlin! | ||||
* | | | Allow communicating with blue box dialogs across a region border via a | Melanie Thielker | 2010-07-17 | 1 | -8/+7 |
| |/ |/| | | | | | child agent | ||||
* | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-07-14 | 5 | -166/+213 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-07-14 | 17 | -133/+70 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-07-14 | 14 | -122/+56 |
| | |\ | |||||
| | * | | Removed a few obsolete mono addin references. Mantis #4854 | Diva Canto | 2010-07-14 | 1 | -9/+0 |
| | | | | |||||
| * | | | improve closing of load/save iar streams in the event of a problem | Justin Clark-Casey (justincc) | 2010-07-14 | 4 | -157/+213 |
| | | | | |||||
* | | | | Detach attachments displaced by other attachments | Melanie Thielker | 2010-07-14 | 1 | -5/+19 |
| |_|/ |/| | | |||||
* | | | Major attachments cleanup. Remove unused AttachObject ClientView method | Melanie | 2010-07-14 | 13 | -117/+51 |
| | | | | | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters | ||||
* | | | Remove useless quaternion parameter from AttachObject sig | Melanie Thielker | 2010-07-14 | 6 | -10/+10 |
| |/ |/| | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-07-14 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-07-14 | 4 | -20/+132 |
| |\ | |||||
| * | | comment out obsolete assert that 'item has been passed to another user since ↵ | Justin Clark-Casey (justincc) | 2010-07-14 | 1 | -1/+1 |
| | | | | | | | | | | | | it was last set' perms flag was set when a prim item was added to a scene object | ||||
* | | | Fixes mantis #4870. | Diva Canto | 2010-07-14 | 2 | -2/+14 |
| |/ |/| | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-07-14 | 10 | -117/+180 |
|\ \ | |||||
| * \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-07-14 | 1 | -12/+0 |
| |\ \ | | |/ | |/| | |||||
| | * | Cleaned up a couple of things from OpenSim.ini.example: [Friends] section ↵ | Diva Canto | 2010-07-14 | 1 | -12/+0 |
| | | | | | | | | | | | | has been in other inis for a while, not needed here; and [Network] remoteDataPort is obsolete. | ||||
| * | | Fix a permissions issue | Melanie Thielker | 2010-07-14 | 2 | -11/+22 |
| |/ |