aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix merge issuesMelanie2010-10-181-12/+0
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-187-159/+235
|\
| * remove some cruft from last commitdahlia2010-10-181-8/+0
| * initial support for meshies physics. Must set ini option UseMeshiesPhysicsMes...dahlia2010-10-181-43/+94
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-10-173-0/+55
| |\
| | * Adding osFunctions for light projectionBlueWall2010-10-173-0/+55
| * | Deleted all [XmlIgnore] from SOP, since those are meaningless now.Diva Canto2010-10-172-58/+58
| * | .NET automagical serialization of SOPs replaced by manual serialization acros...Diva Canto2010-10-173-62/+28
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-1611-180/+279
|\ \ | |/
| * Drop max oar loading version back to 0 from 1Justin Clark-Casey (justincc)2010-10-161-1/+1
| * Rip out version option since it turns out that the changed object serializati...Justin Clark-Casey (justincc)2010-10-163-10/+13
| * change --old-guids switch on the save oar command line to --version=<x>Justin Clark-Casey (justincc)2010-10-166-11/+33
| * Have OpenSim throw a strop if it tries to load an OAR with a major version th...Justin Clark-Casey (justincc)2010-10-162-1/+23
| * save oar control file first rather than in the middle so that it's the first ...Justin Clark-Casey (justincc)2010-10-163-38/+41
| * Fix test break - TestSerializeXml2() still requires old-guids optionJustin Clark-Casey (justincc)2010-10-161-3/+6
| * Made OARs use the new serialization procedure. (TPs/crossings still on the ol...Diva Canto2010-10-1510-142/+188
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2010-10-166-375/+799
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-166-375/+799
| |\ \ | | |/
| | * A couple of more ways attachment point is sentLatif Khalifa2010-10-151-0/+8
| | * one more silly line ending thing.... *If you have problems, fetch the tree an...Teravus Ovares (Dan Olivares)2010-10-151-71/+71
| | * more work in progress on mesh physics - still non-functionaldahlia2010-10-141-2/+67
| | * laying some groundwork for mesh physicsdahlia2010-10-141-70/+80
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-144-108/+171
| | |\
| | | * Don't distroy attachments when using viewer 2.1+, strip multiple attachment dataLatif Khalifa2010-10-141-0/+4
| | | * Kill some magic numbers in the mesh upload module and change the mesh assetMelanie2010-10-141-3/+3
| | | * Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ...Diva Canto2010-10-142-105/+164
| | * | * Replacing Magic numbers with EnumsTeravus Ovares (Dan Olivares)2010-10-142-4/+4
| | |/
| | * * A few additional cleanup elementsTeravus Ovares (Dan Olivares)2010-10-142-0/+6
| | * * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'Teravus Ovares (Dan Olivares)2010-10-141-1/+1
| | * * Tweaked the upload response and now at least uploading the mesh works.Teravus Ovares (Dan Olivares)2010-10-142-16/+21
| | * Rename file + more testing and tweakingTeravus Ovares (Dan Olivares)2010-10-141-9/+17
| | * * Partially complete stuff for Mesh support that Melanie wanted to see before...Teravus Ovares (Dan Olivares)2010-10-142-0/+449
| | * Added SOP.MediaUrl and Shape.Media to the deserializationDiva Canto2010-10-131-204/+14
* | | Actually set the PrivateBinPath in XEngine so relocating the scriptsMelanie2010-10-162-6/+7
|/ /
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-132-7/+1381
|\ \ | |/
| * Comment a debug message so that it doesn't spew the console upon encountering...Diva Canto2010-10-131-1/+1
| * New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for loa...Diva Canto2010-10-132-7/+1381
* | change default next owner persm to mod/trans to match SL.Melanie2010-10-131-1/+4
* | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-10-102-14/+15
|\ \
| * | Add group invites to the list of messages that get offlinedMelanie2010-10-102-14/+15
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-102-3/+11
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-102-3/+11
| |\ \
| | * | * Make line endings consistant in Meshmerizer.csTeravus Ovares (Dan Olivares)2010-10-091-1/+1
| | * | Fix a typo in previouis commit: start must not pass the end of the fileLatif Khalifa2010-10-091-2/+2
| | * | weird line endings fix commitTeravus Ovares (Dan Olivares)2010-10-091-7/+7
| | * | Return error code instead of the last byte of the file if range is not satisf...Latif Khalifa2010-10-091-1/+9
| | * | In case when 1 single byte is requested (yes viewer does this)Latif Khalifa2010-10-091-2/+2
| * | | Change the part for sound playback to be the root part / object UUID insteadMelanie2010-10-101-8/+8
| |/ /
* | | Change the part for sound playback to be the root part / object UUID insteadMelanie2010-10-101-8/+8
| |/ |/|
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-092-4/+7
|\ \ | |/
generated by cgit v1.1 at 2024-12-23 15:42:40 +0000