ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-03 15:36:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,732 Commits 5 Branches 88 Tags
5f8a0f3d1f4cd9948ced87e312bcd0c4a616ef2a
Commit Graph

3056 Commits

Author SHA1 Message Date
Melanie
164007dd00 Merge branch 'master' into careminster-presence-refactor 2010-11-18 19:06:09 +00:00
Justin Clark-Casey (justincc)
859234f963 small refactor: reuse existing commandLine string rather than calling cmdline.ToString() again 2010-11-17 23:50:23 +00:00
Justin Clark-Casey (justincc)
c072a9cfb3 save all lines to history, not just those which turn out to be valid comands. does not store passwords 
also, blank lines are not stored to history
this makes it easier to go back and correct a command which was simply mistyped rather than having to type it out again
 2010-11-17 23:34:39 +00:00
Justin Clark-Casey (justincc)
e6eeaaea67 minor: add some method comments 2010-11-17 22:55:06 +00:00
Melanie
7bb005b0d1 Change the way attachments are persisted. Editing a worn attachment will now 
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
 2010-11-16 21:01:56 +00:00
Melanie
4f15b8d4e6 Change the way attachments are persisted. Editing a worn attachment will now 
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
 2010-11-16 20:44:39 +01:00
Melanie
ee85a530f6 Merge branch 'master' into careminster-presence-refactor 2010-11-09 22:16:48 +00:00
Melanie
ccfbce3176 Remove "OpenSimulator" from startup message 2010-11-09 16:07:43 +01:00
Melanie
09ea73f7cc Change "OpenSim" to "Careminster" and remove CM suffix. 2010-11-09 15:33:03 +01:00
Jeff Ames
ae9c4a4d11 Formatting cleanup. 2010-11-08 07:48:35 -05:00
Melanie
f985775962 Revert "Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready." 
This reverts commit 91b1d17e5b.

Conflicts:

	OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2010-11-05 14:27:14 +01:00
Melanie
5f8ab9f018 Merge branch 'master' into careminster-presence-refactor 2010-11-03 02:34:36 +00:00
Melanie
4ab9d37a8e When LightShare is enabled, the standard day cycle is bypassed and replaced by 
midday defaults when no specific LightShare profile is set.
This prevents LightShare info being send out when the region has no LightShare
profile, allowing normal day/night cycles to happen.
 2010-11-03 02:04:17 +00:00
mores
1f77f05f02 Admin Server can now bind to a private ip address 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-11-03 01:12:48 +00:00
mores
d5d0e81df2 Admin Server can now bind to a private ip address 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-11-03 01:09:38 +00:00
Melanie
26f12f479f Merge branch 'master' into careminster-presence-refactor 2010-11-02 22:58:33 +00:00
Melanie
43ac44b028 Fix default club feet 2010-11-02 21:41:27 +00:00
Marck
4fdab71c8d Add support for cross-domain AJAX requests to REST console. 
Enables RemoteConsole to add the appropriate HTTP header when responding to requests that use Cross-Origin Resource Sharing (CORS with simple requests). The allowed origin is set with configuration option "ConsoleAllowedOrigin" in section [Network]. For a suggestion to make this configuration option more flexible, see the TODO comment in the source code.

The WifiConsole uses this functionality with grid mode.
 2010-11-02 14:12:25 -07:00
Marck
4d1f0c5348 Support for CORS with simple requests in BaseHttpServer 2010-11-02 14:11:49 -07:00
Melanie
63ffdcf53a Try to not make avatars switch outfits 2010-11-02 19:55:05 +00:00
Melanie
e98d8d500f Fix logins and avatar appearance. Contains a Migration. May contain nuts. 
This will cause visual params to be persisted along with worn items. With
this, alpha and tattoo laters will be saved. Multiple layers MAY work, but
not tested because I don't use Viewer 2.
 2010-10-30 19:06:47 +01:00
Melanie
d0895a4a3a On first login, Ruth is back now. Strangely, inventory items are created for 
tattoo and alpha layers. Any change of appearance in the sim makes the green
gnome reappear on next login. Progress of sorts.
 2010-10-30 03:28:59 +01:00
Melanie
adef6b04cb Logins work now, but avatars are green ugly gnomes. 2010-10-30 02:52:59 +01:00
Melanie
ff7da2082d This commit fixes all the appearance related null refs. Still can't log in, 
client displays a blank error box.
 2010-10-30 02:25:25 +01:00
Melanie
7503c4ad61 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-30 00:56:42 +01:00
Melanie
818ed2032a READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. 
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
 2010-10-30 00:41:36 +01:00
Justin Clark-Casey (justincc)
e66ec432af Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic 2010-10-29 23:45:10 +01:00
Melanie
69c1e0b2f7 Merge branch 'master' into careminster-presence-refactor 2010-10-29 21:22:35 +01:00
Melanie
934e536738 Merge commit 'cmickeyb/dev-appearance' 2010-10-29 21:06:46 +01:00
Master ScienceSim
f5c9a56c8b Bunch of fixes that reduce the number of times appearance 
and avatar data are sent. And the number of times they
are stored.
 2010-10-29 13:43:35 -07:00
Melanie
5f4badf9e2 Add my work on top of cmickeyb's 2010-10-29 20:44:29 +01:00
Melanie
05d2302c62 Merge branch 'dev-appearance' 2010-10-29 20:24:14 +01:00
Melanie
e6fe83cd93 Revert "Preliminary work on appearance layers. No user functionality yet." 
This work conflicts with cmickeyb's more extensive, related work

This reverts commit 9c829c0410.
 2010-10-29 20:17:59 +01:00
Melanie
840b75ca9b Add my work on top of cmickeyb's 2010-10-29 20:48:37 +02:00
Melanie
9331898c32 Merge branch 'master' into careminster-presence-refactor 2010-10-29 20:40:48 +01:00
Melanie
3231602b88 Revert "Preliminary work on appearance layers. No user functionality yet." 
This reverts commit e6a8d2872c.
 2010-10-29 20:34:53 +02:00
Melanie
9c829c0410 Preliminary work on appearance layers. No user functionality yet. 2010-10-29 18:58:22 +01:00
Melanie
e6a8d2872c Preliminary work on appearance layers. No user functionality yet. 2010-10-29 18:59:53 +02:00
Master ScienceSim
68666efd25 Configuration of persistent baked textures and save/send delays. 2010-10-28 12:00:04 -07:00
Master ScienceSim
f2c1d0e34f Merge branch 'opensim-master' into dev-appearance 2010-10-28 09:09:42 -07:00
Master ScienceSim
0f28fa400d Added background thread to handle delayed send and save of appearance 
to accommodate batching of the many updates that happen on login
and teleport.

Fixed handling of the serial property in appearance.
 2010-10-28 09:00:39 -07:00
Master ScienceSim
9cfd3e1d5a Small cleanup and add more debugging information 2010-10-26 12:54:28 -07:00
Master ScienceSim
6e58c3d563 Half of the compatibility is working. Login into a new region with 
old data works. Teleport out of a new region with old data works.
Teleport into a new region with old data does not trigger the
necessary rebake.
 2010-10-25 14:11:47 -07:00
Mic Bowman
657cceb884 Intermediate commit for backward compatability; does not compile yet 2010-10-25 09:42:28 -07:00
Melanie
7f74dc1b14 Merge branch 'master' into careminster-presence-refactor 2010-10-23 00:21:42 +01:00
Justin Clark-Casey (justincc)
fe8d3d5a2b Revert "Merge remote branch 'otakup0pe/mantis5110'" 
This reverts commit 21187f459e, reversing
changes made to 8f34e46d74.
 2010-10-22 23:52:07 +01:00
Jonathan Freedman
38e76d71ac Merge branch 'hg16' into mantis5110 2010-10-22 18:34:50 -04:00
Justin Clark-Casey (justincc)
6d7ce63085 Allow OARs and IARs to save and load meshes. 
Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/
However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer).
Not sure if this is really and OAR load problem.  Needs more investigation.
 2010-10-22 18:33:55 -04:00
Master ScienceSim
267f18925d First attempt to get multiple attachments working to support viewer2. 
The attachment code appears to work correctly for 1.23 viewers so, in
spite of some big changes in the internal representation, there don't
appear to be regressions. That being said, I still can't get a viewer2
avatar to show correctly.
 2010-10-21 16:48:58 -07:00
Melanie
08e14d653e Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance 2010-10-21 17:09:42 +01:00