aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Unit test breakage fix.Diva Canto2010-08-202-3/+3
|
* Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵Diva Canto2010-08-191-82/+0
| | | | myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general.
* Partial rewrite of client IP verification. Not completely finished yet, and ↵Diva Canto2010-08-191-1/+3
| | | | untested. Committing to move to my other computer.
* Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943."Diva Canto2010-08-191-40/+28
| | | | | | Reverting mostly because of the texture asset files that got committed and cause grief with the 0.7-post-fixes branch. But also because I'm going to go at those mantises in another way. This reverts commit e47608fc62647a28be91dd9caf6e446826fdb54c.
* One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943.Diva Canto2010-08-181-28/+40
| | | | (Files .xml and .txt also want to be committed)
* Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files ↵Diva Canto2010-08-161-0/+2
| | | | affected.
* Work on TeleportStart: renamed method from TeleportLocationStart to ↵Diva Canto2010-08-161-1/+1
| | | | TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).
* * Cleaned up the magic UUID definitions in AvatarWearable.csJohn Hurliman2010-08-131-12/+27
|
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-072-30/+42
|\
| * Fix XStats formatting:BlueWall (James Hughes)2010-08-061-30/+35
| | | | | | | | | | | | | | Recent libomv update broke the json serialization for XStats. This uses String.Format to convert all data to strings with fixed decimal (2 places ), or integer formats as appropriate.
| * HACK ALERT! There's some underlying bug in the HTTP server that makes ↵Diva Canto2010-08-061-0/+7
| | | | | | | | requests come up with Accept headers from previous requests. Until that gets fixed, this hack goes in.
* | Correct display of landmark about info. Also correct region maturity ratingMelanie Thielker2010-08-071-1/+11
|/ | | | | in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity.
* Merge branch 'moap'Justin Clark-Casey (justincc)2010-08-062-3/+114
|\
| * Simplify serialized version string. Change element capitalization for ↵Justin Clark-Casey (justincc)2010-08-031-5/+10
| | | | | | | | | | | | | | consistency THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME. If you're testing, please start with a new database. This commit also improves locking for manipulation of media entries.
| * get rid of PrimitiveBaseShape.MediaRaw staging postJustin Clark-Casey (justincc)2010-08-031-6/+0
| | | | | | | | | | using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
| * remove duplicated serialization codeJustin Clark-Casey (justincc)2010-08-031-12/+26
| |
| * serialize media textures to inventory with a largely osd representation ↵Justin Clark-Casey (justincc)2010-08-031-3/+87
| | | | | | | | | | | | | | rather than .net auto-serialization THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS. If you're testing this, please start with new databases. This makes media textures serialized in the same way, which is probably better in the long term.
| * comment out further debug line in BaseHttpServerJustin Clark-Casey (justincc)2010-07-271-1/+1
| |
| * relocate serialization code from SQLiteRegionData to MoapModule using load ↵Justin Clark-Casey (justincc)2010-07-261-0/+6
| | | | | | | | | | | | | | | | | | | | and save events. This is better modularity. It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future. Remaining non-modularity: PrimitiveBaseShape needs explicit Media and MediaRaw fields. MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer. The database also needs to know about MediaRaw though not about Media. IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
| * implement llSetPrimMediaParams()Justin Clark-Casey (justincc)2010-07-261-0/+1
| | | | | | | | Untested
| * start storing incoming MediaEntry on a new Media field on PrimitiveBaseShapeJustin Clark-Casey (justincc)2010-07-261-0/+7
| | | | | | | | | | 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
| * do a whole load of crappy hacking to get cubes to display google.comJustin Clark-Casey (justincc)2010-07-261-1/+1
| | | | | | | | | | | | 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
* | Merge branch 'iar-merge'Justin Clark-Casey (justincc)2010-08-041-2/+27
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
| * | Add --merge switch to load iar.Justin Clark-Casey (justincc)2010-06-301-2/+27
| | | | | | | | | | | | | | | | | | When this switch is used, iar folders are merged with existing same-name user inventory folders. This makes it a little easier to back and restore entire individual user inventories, among other things Added unit test to check behaviour
* | | Revert "remove long unused OpenSim/Framework/Configuration/* projects"Melanie2010-08-043-0/+323
| | | | | | | | | | | | This reverts commit cdd3f17b2bee58def470635cfc06e26b0d0145b2.
* | | Slight improvement on previous commit.Diva Canto2010-07-301-1/+13
| | |
* | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-07-3013-1509/+0
|\ \ \
| * | | remove long unused OpenSim/Framework/Configuration/* projectsJustin Clark-Casey (justincc)2010-07-303-323/+0
| | | |
| * | | Remove unused ILoginServiceToRegionsConnectorJustin Clark-Casey (justincc)2010-07-301-41/+0
| | | |
| * | | Remove unused LLFileTransferJustin Clark-Casey (justincc)2010-07-301-40/+0
| | | |
| * | | remove long superseded HGNetworkServersInfoJustin Clark-Casey (justincc)2010-07-301-107/+0
| | | |
| * | | remove unused FriendRegionInfoJustin Clark-Casey (justincc)2010-07-301-38/+0
| | | |
| * | | remove now unused GridConfig, MessageServerConfig, UserConfigJustin Clark-Casey (justincc)2010-07-304-583/+0
| | | |
| * | | remove unused ACL classJustin Clark-Casey (justincc)2010-07-302-377/+0
| | | |
* | | | Changed the way HG client verification is done: now transforming local and ↵Diva Canto2010-07-301-0/+72
|/ / / | | | | | | | | | LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network.
* | | * Tweaked WebUtil.PostToService() to help debug an object disposed exceptionJohn Hurliman2010-07-291-3/+4
| |/ |/|
* | Added ': ' to password prompt. Mantis #4851Diva Canto2010-07-221-1/+1
| |
* | Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie2010-07-141-1/+0
| | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
* | Remove useless quaternion parameter from AttachObject sigMelanie Thielker2010-07-141-1/+1
| |
* | Add scripted controllers into agent intersim messagingMelanie Thielker2010-07-111-0/+65
| |
* | Handle a specific exception without spewing red ink.Melanie2010-07-081-2/+13
| |
* | Clean up IMoneyModule and adjust the other modules to the changesMelanie Thielker2010-07-022-6/+7
| |
* | Remove GetEconomyData and the economy data structure (unused)Melanie Thielker2010-07-021-21/+0
|/
* fix web request exception reporting properly this timeJustin Clark-Casey (justincc)2010-06-251-1/+1
|
* Revert "Report http server onRequest() exception properly."Justin Clark-Casey (justincc)2010-06-251-1/+1
| | | | This reverts commit c09451a034babe6de7a2ffec44852a19946ec76d.
* Report http server onRequest() exception properly.Justin Clark-Casey (justincc)2010-06-251-1/+1
|
* minor: Move log information about SYSTEMIP to the place where it's resolvedJustin Clark-Casey (justincc)2010-06-251-7/+13
|
* * SimianAssetServiceConnector Delete() was expecting the wrong type of ↵John Hurliman2010-06-241-1/+1
| | | | | | response, reporting false errors * Fixed a typo in a WebUtil error message
* Force newly connecting remote consoles to display a promptMelanie2010-06-171-0/+7
|
* Readjust master version and flavorMelanie2010-06-151-2/+2
|